* dwarf2read.c (skip_leb128, peek_die_abbrev, skip_one_die)

[binutils.git] / Makefile.tpl

diff --git a/Makefile.tpl b/Makefile.tpl
index ce1ef743b634284fba1fa6cdc45a3139ee99fde7..6a30f45941b31cfea47fbfa35ddc28dea6ae847b 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -6,7 +6,7 @@ in
 #
 # Makefile for directory with subdirs to build.
 #   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
 #
 # Makefile for directory with subdirs to build.
 #   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,

-#   1999, 2000, 2001, 2002 Free Software Foundation
+#   1999, 2000, 2001, 2002, 2003 Free Software Foundation

 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -23,43 +23,25 @@ in
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 

-# Tell GNU make 3.79 not to run the top level in parallel.  This 
-# prevents contention for $builddir/$target/config.cache, as well
-# as minimizing scatter in file system caches.
-NOTPARALLEL = .NOTPARALLEL
-$(NOTPARALLEL):
-
+# -------------------------------
+# Standard Autoconf-set variables
+# -------------------------------

 VPATH=@srcdir@
 VPATH=@srcdir@

-links=@configlinks@

 
 build_alias=@build_alias@
 
 build_alias=@build_alias@

-build_cpu=@build_cpu@
-build_vendor=@build_vendor@
-build_os=@build_os@
-build_canonical=@build_cpu@-@build_vendor@-@build_os@
+build=@build@

 host_alias=@host_alias@
 host_alias=@host_alias@

-host_cpu=@host_cpu@
-host_vendor=@host_vendor@
-host_os=@host_os@
-host_canonical=@host_cpu@-@host_vendor@-@host_os@
+host=@host@

 target_alias=@target_alias@
 target_alias=@target_alias@

-target_cpu=@target_cpu@
-target_vendor=@target_vendor@
-target_os=@target_os@
-target_canonical=@target_cpu@-@target_vendor@-@target_os@
-
-enable_shared = @enable_shared@
-enable_threads = @enable_threads@
-enable_version_specific_runtime_libs = @enable_version_specific_runtime_libs@
-# The file containing GCC's version number.
-gcc_version_trigger = @gcc_version_trigger@
-gcc_version = @gcc_version@
+target=@target@

 
 

-srcdir = @srcdir@
+program_transform_name = @program_transform_name@

 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 

+srcdir = @srcdir@
+

 bindir = @bindir@
 sbindir = @sbindir@
 libexecdir = @libexecdir@
 bindir = @bindir@
 sbindir = @sbindir@
 libexecdir = @libexecdir@


@@ -72,14 +54,6 @@ includedir = @includedir@
 oldincludedir = @oldincludedir@
 infodir = @infodir@
 mandir = @mandir@
 oldincludedir = @oldincludedir@
 infodir = @infodir@
 mandir = @mandir@

-gxx_include_dir = @gxx_include_dir@
-libstdcxx_incdir = @libstdcxx_incdir@
-
-tooldir = @tooldir@
-build_tooldir = @build_tooldir@
-
-program_transform_name = @program_transform_name@
-

 man1dir = $(mandir)/man1
 man2dir = $(mandir)/man2
 man3dir = $(mandir)/man3
 man1dir = $(mandir)/man1
 man2dir = $(mandir)/man2
 man3dir = $(mandir)/man3


@@ -89,73 +63,97 @@ man6dir = $(mandir)/man6
 man7dir = $(mandir)/man7
 man8dir = $(mandir)/man8
 man9dir = $(mandir)/man9
 man7dir = $(mandir)/man7
 man8dir = $(mandir)/man8
 man9dir = $(mandir)/man9

+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_DATA = @INSTALL_DATA@
+
+# -------------------------------------------------
+# Miscellaneous non-standard autoconf-set variables
+# -------------------------------------------------
+
+links=@configlinks@
+# The file containing GCC's version number.
+gcc_version_trigger = @gcc_version_trigger@
+gcc_version = @gcc_version@
+
+# The gcc driver likes to know the arguments it was configured with.
+TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@
+
+gxx_include_dir = @gxx_include_dir@
+libstdcxx_incdir = @libstdcxx_incdir@
+
+tooldir = @tooldir@
+build_tooldir = @build_tooldir@
+

 # Directory in which the compiler finds executables, libraries, etc.
 # Directory in which the compiler finds executables, libraries, etc.

-libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version)
+libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)

 GDB_NLM_DEPS = 
 
 GDB_NLM_DEPS = 
 

+# This is the name of the environment variable used for the path to
+# the libraries.
+RPATH_ENVVAR = @RPATH_ENVVAR@
+
+# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared
+# was used.
+SET_LIB_PATH = @SET_LIB_PATH@
+
+# configure.in sets SET_LIB_PATH to this if --enable-shared was used.
+# Some platforms don't like blank entries, so we remove duplicate,
+# leading and trailing colons.
+REALLY_SET_LIB_PATH = \
+  $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
+
+# This is the list of directories to be built for the build system.
+BUILD_CONFIGDIRS = libiberty
+# Build programs are put under this directory.
+BUILD_SUBDIR = @build_subdir@
+# This is set by the configure script to the arguments to use when configuring
+# directories built for the build system.
+BUILD_CONFIGARGS = @build_configargs@
+
+# This is the list of directories to built for the host system.
+SUBDIRS = @configdirs@
+# This is set by the configure script to the arguments to use when configuring
+# directories built for the host system.
+HOST_CONFIGARGS = @host_configargs@
+
+# This is set by the configure script to the list of directories which
+# should be built using the target tools.
+TARGET_CONFIGDIRS = @target_configdirs@
+# Target libraries are put under this directory:
+TARGET_SUBDIR = @target_subdir@
+# This is set by the configure script to the arguments to use when configuring
+# directories built for the target.
+TARGET_CONFIGARGS = @target_configargs@
+
+# ----------------------------------------------
+# Programs producing files for the BUILD machine
+# ----------------------------------------------
+

 SHELL = @config_shell@
 
 # pwd command to use.  Allow user to override default by setting PWDCMD in
 # the environment to account for automounters.  The make variable must not
 # be called PWDCMD, otherwise the value set here is passed to make
 # subprocesses and overrides the setting from the user's environment.
 SHELL = @config_shell@
 
 # pwd command to use.  Allow user to override default by setting PWDCMD in
 # the environment to account for automounters.  The make variable must not
 # be called PWDCMD, otherwise the value set here is passed to make
 # subprocesses and overrides the setting from the user's environment.

-PWD = $${PWDCMD-pwd}
+# Don't use PWD since it is a common shell environment variable and we
+# don't want to corrupt it.
+PWD_COMMAND = $${PWDCMD-pwd}

 
 

-# INSTALL_PROGRAM_ARGS is changed by configure.in to use -x for a
-# cygwin host.
-INSTALL_PROGRAM_ARGS =
-
-INSTALL = $(SHELL) $$s/install-sh -c
-INSTALL_PROGRAM = $(INSTALL) $(INSTALL_PROGRAM_ARGS)
-INSTALL_SCRIPT = $(INSTALL)
-INSTALL_DATA = $(INSTALL) -m 644
+# compilers to use to create programs which must be run in the build
+# environment.
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@

 
 

-AS = @AS@
-AR = @AR@
-AR_FLAGS = rc
-CC = @CC@
+CXX_FOR_BUILD = $(CXX)

 
 # Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
 # here so that they can be overridden by Makefile fragments.
 
 # Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
 # here so that they can be overridden by Makefile fragments.

-BUILD_CC = $(CC_FOR_BUILD)

 BUILD_PREFIX = @BUILD_PREFIX@
 BUILD_PREFIX_1 = @BUILD_PREFIX_1@
 
 BUILD_PREFIX = @BUILD_PREFIX@
 BUILD_PREFIX_1 = @BUILD_PREFIX_1@
 

-CFLAGS = @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
-
-LDFLAGS = 
-LIBCFLAGS = $(CFLAGS)
-CFLAGS_FOR_BUILD = $(CFLAGS)
-# During gcc bootstrap, if we use some random cc for stage1 then
-# CFLAGS will be just -g.  We want to ensure that TARGET libraries
-# (which we know are built with gcc) are built with optimizations so
-# prepend -O2 when setting CFLAGS_FOR_TARGET.
-CFLAGS_FOR_TARGET = -O2 $(CFLAGS)
-LDFLAGS_FOR_TARGET = 
-LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
-PICFLAG = 
-PICFLAG_FOR_TARGET = 
-
-CXX = @CXX@
-
-# Use -O2 to stress test the compiler.
-LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
-LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
-
-DLLTOOL = @DLLTOOL@
-WINDRES = @WINDRES@
-
-NM = @NM@
-
-LD = @LD@
-
-# These values are substituted by configure.
-DEFAULT_YACC = @DEFAULT_YACC@
-DEFAULT_LEX = @DEFAULT_LEX@
-DEFAULT_M4 = @DEFAULT_M4@
-

 BISON=@BISON@
 USUAL_BISON = `if [ -f $$r/bison/bison ] ; then \
            echo $$r/bison/bison -L $$s/bison/ ; \
 BISON=@BISON@
 USUAL_BISON = `if [ -f $$r/bison/bison ] ; then \
            echo $$r/bison/bison -L $$s/bison/ ; \


@@ -163,6 +161,7 @@ USUAL_BISON = `if [ -f $$r/bison/bison ] ; then \
            echo bison ; \
         fi`
 
            echo bison ; \
         fi`
 

+DEFAULT_YACC = @DEFAULT_YACC@

 YACC=@YACC@
 USUAL_YACC = `if [ -f $$r/bison/bison ] ; then \
            echo $$r/bison/bison -y -L $$s/bison/ ; \
 YACC=@YACC@
 USUAL_YACC = `if [ -f $$r/bison/bison ] ; then \
            echo $$r/bison/bison -y -L $$s/bison/ ; \


@@ -172,28 +171,31 @@ USUAL_YACC = `if [ -f $$r/bison/bison ] ; then \
            echo ${DEFAULT_YACC} ; \
        fi`
 
            echo ${DEFAULT_YACC} ; \
        fi`
 

+DEFAULT_LEX = @DEFAULT_LEX@

 LEX=@LEX@
 USUAL_LEX = `if [ -f $$r/flex/flex ] ; \
        then echo $$r/flex/flex ; \
        else echo ${DEFAULT_LEX} ; fi`
 
 LEX=@LEX@
 USUAL_LEX = `if [ -f $$r/flex/flex ] ; \
        then echo $$r/flex/flex ; \
        else echo ${DEFAULT_LEX} ; fi`
 

+DEFAULT_M4 = @DEFAULT_M4@

 M4 = `if [ -f $$r/m4/m4 ] ; \
        then echo $$r/m4/m4 ; \
        else echo ${DEFAULT_M4} ; fi`
 
 M4 = `if [ -f $$r/m4/m4 ] ; \
        then echo $$r/m4/m4 ; \
        else echo ${DEFAULT_M4} ; fi`
 

-# For an installed makeinfo, we require it to be from texinfo 4 or
+# For an installed makeinfo, we require it to be from texinfo 4.2 or

 # higher, else we use the "missing" dummy.
 MAKEINFO=@MAKEINFO@
 USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
        then echo $$r/texinfo/makeinfo/makeinfo ; \
        else if (makeinfo --version \
 # higher, else we use the "missing" dummy.
 MAKEINFO=@MAKEINFO@
 USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
        then echo $$r/texinfo/makeinfo/makeinfo ; \
        else if (makeinfo --version \

-         | egrep 'texinfo[^0-9]*([1-3][0-9]|[4-9])') >/dev/null 2>&1; \
+         | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \

         then echo makeinfo; else echo $$s/missing makeinfo; fi; fi`
 
 # This just becomes part of the MAKEINFO definition passed down to
 # sub-makes.  It lets flags be given on the command line while still
 # using the makeinfo from the object tree.
         then echo makeinfo; else echo $$s/missing makeinfo; fi; fi`
 
 # This just becomes part of the MAKEINFO definition passed down to
 # sub-makes.  It lets flags be given on the command line while still
 # using the makeinfo from the object tree.

-MAKEINFOFLAGS =
+# (Default to avoid splitting info files by setting the threshold high.)
+MAKEINFOFLAGS = --split-size=5000000

 
 EXPECT = `if [ -f $$r/expect/expect ] ; \
        then echo $$r/expect/expect ; \
 
 EXPECT = `if [ -f $$r/expect/expect ] ; \
        then echo $$r/expect/expect ; \


@@ -203,74 +205,61 @@ RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \
        then echo $$s/dejagnu/runtest ; \
        else echo runtest ; fi`
 
        then echo $$s/dejagnu/runtest ; \
        else echo runtest ; fi`
 

+# ---------------------------------------------
+# Programs producing files for the HOST machine
+# ---------------------------------------------

 
 

-# compilers to use to create programs which must be run in the build
-# environment.
-CC_FOR_BUILD = @CC_FOR_BUILD@
-CXX_FOR_BUILD = $(CXX)
+# This is the list of directories that may be needed in RPATH_ENVVAR
+# so that programs built for the host machine work.
+HOST_LIB_PATH = $$r/bfd:$$r/opcodes

 
 

-SUBDIRS = @configdirs@
+AS = @AS@

 
 

-# This is set by the configure script to the list of directories which
-# should be built using the target tools.
-TARGET_CONFIGDIRS = @target_configdirs@
+AR = @AR@
+AR_FLAGS = rc

 
 

-# Target libraries are put under this directory:
-# Changed by configure to $(target_alias) if cross.
-TARGET_SUBDIR = @target_subdir@
+CC = @CC@
+CFLAGS = @CFLAGS@
+LIBCFLAGS = $(CFLAGS)

 
 

-BUILD_CONFIGDIRS = libiberty
-BUILD_SUBDIR = @build_subdir@
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
+LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates

 
 

-# This is set by the configure script to the arguments to use when configuring
-# directories built for the build system.
-BUILD_CONFIGARGS = @build_configargs@
+DLLTOOL = @DLLTOOL@

 
 

-# This is set by the configure script to the arguments to use when configuring
-# directories built for the host system.
-HOST_CONFIGARGS = @host_configargs@
+NM = @NM@

 
 

-# This is set by the configure script to the arguments to use when configuring
-# directories built for the target.
-TARGET_CONFIGARGS = @target_configargs@
+LD = @LD@
+LDFLAGS = 

 
 

-# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared
-# was used.
-SET_LIB_PATH = @SET_LIB_PATH@
+RANLIB = @RANLIB@

 
 

-# This is the name of the environment variable used for the path to
-# the libraries.  This may be changed by configure.in.
-RPATH_ENVVAR = @RPATH_ENVVAR@
+WINDRES = @WINDRES@

 
 

-# This is the list of directories that may be needed in RPATH_ENVVAR
-# so that programs built for the host machine work.
-HOST_LIB_PATH = $$r/bfd:$$r/opcodes
+PICFLAG = 
+
+# -----------------------------------------------
+# Programs producing files for the TARGET machine
+# -----------------------------------------------

 
 # This is the list of directories that may be needed in RPATH_ENVVAR
 # so that prorgams built for the target machine work.
 TARGET_LIB_PATH = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:
 
 
 # This is the list of directories that may be needed in RPATH_ENVVAR
 # so that prorgams built for the target machine work.
 TARGET_LIB_PATH = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:
 

-# configure.in sets SET_LIB_PATH to this if --enable-shared was used.
-# Some platforms don't like blank entries, so we remove duplicate,
-# leading and trailing colons.
-REALLY_SET_LIB_PATH = \
-  $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
-# Should be substed by configure.in

 FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
 FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@

-CC_FOR_TARGET = @CC_FOR_TARGET@
-CXX_FOR_TARGET = @CXX_FOR_TARGET@
-RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@
-CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
-RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
-GCJ_FOR_TARGET = @GCJ_FOR_TARGET@

 
 

-# If GCC_FOR_TARGET is not overriden on the command line, then this
-# variable is passed down to the gcc Makefile, where it is used to
-# build libgcc2.a.  We define it here so that it can itself be
-# overridden on the command line.
-GCC_FOR_TARGET=@GCC_FOR_TARGET@
-USUAL_GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) $$r/gcc/xgcc -B$$r/gcc/ $(FLAGS_FOR_TARGET)
+AR_FOR_TARGET=@AR_FOR_TARGET@
+USUAL_AR_FOR_TARGET = ` \
+  if [ -f $$r/binutils/ar ] ; then \
+    echo $$r/binutils/ar ; \
+  else \
+    if [ '$(host)' = '$(target)' ] ; then \
+      echo $(AR); \
+    else \
+       echo ar | sed '$(program_transform_name)' ; \
+    fi; \
+  fi`

 
 AS_FOR_TARGET=@AS_FOR_TARGET@
 USUAL_AS_FOR_TARGET = ` \
 
 AS_FOR_TARGET=@AS_FOR_TARGET@
 USUAL_AS_FOR_TARGET = ` \


@@ -279,60 +268,75 @@ USUAL_AS_FOR_TARGET = ` \
   elif [ -f $$r/gcc/xgcc ]; then \
     $(CC_FOR_TARGET) -print-prog-name=as ; \
   else \
   elif [ -f $$r/gcc/xgcc ]; then \
     $(CC_FOR_TARGET) -print-prog-name=as ; \
   else \

-    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+    if [ '$(host)' = '$(target)' ] ; then \

       echo $(AS); \
     else \
       echo $(AS); \
     else \

-       t='$(program_transform_name)'; echo as | sed -e 's/x/x/' $$t ; \
+       echo as | sed '$(program_transform_name)' ; \

     fi; \
   fi`
 
     fi; \
   fi`
 

-LD_FOR_TARGET=@LD_FOR_TARGET@
-USUAL_LD_FOR_TARGET = ` \
-  if [ -f $$r/ld/ld-new ] ; then \
-    echo $$r/ld/ld-new ; \
-  elif [ -f $$r/gcc/xgcc ]; then \
-    $(CC_FOR_TARGET) -print-prog-name=ld ; \
-  else \
-    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-      echo $(LD); \
-    else \
-       t='$(program_transform_name)'; echo ld | sed -e 's/x/x/' $$t ; \
-    fi; \
-  fi`
+CC_FOR_TARGET = @CC_FOR_TARGET@
+# During gcc bootstrap, if we use some random cc for stage1 then
+# CFLAGS will be just -g.  We want to ensure that TARGET libraries
+# (which we know are built with gcc) are built with optimizations so
+# prepend -O2 when setting CFLAGS_FOR_TARGET.
+CFLAGS_FOR_TARGET = -O2 $(CFLAGS)
+# If GCC_FOR_TARGET is not overriden on the command line, then this
+# variable is passed down to the gcc Makefile, where it is used to
+# build libgcc2.a.  We define it here so that it can itself be
+# overridden on the command line.
+GCC_FOR_TARGET=@GCC_FOR_TARGET@
+USUAL_GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) $$r/gcc/xgcc -B$$r/gcc/ $(FLAGS_FOR_TARGET)
+LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
+
+CXX_FOR_TARGET = @CXX_FOR_TARGET@
+RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@
+CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
+RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
+CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
+LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates

 
 DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
 USUAL_DLLTOOL_FOR_TARGET = ` \
   if [ -f $$r/binutils/dlltool ] ; then \
     echo $$r/binutils/dlltool ; \
   else \
 
 DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
 USUAL_DLLTOOL_FOR_TARGET = ` \
   if [ -f $$r/binutils/dlltool ] ; then \
     echo $$r/binutils/dlltool ; \
   else \

-    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+    if [ '$(host)' = '$(target)' ] ; then \

       echo $(DLLTOOL); \
     else \
       echo $(DLLTOOL); \
     else \

-       t='$(program_transform_name)'; echo dlltool | sed -e 's/x/x/' $$t ; \
+       echo dlltool | sed '$(program_transform_name)' ; \

     fi; \
   fi`
 
     fi; \
   fi`
 

-WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
-USUAL_WINDRES_FOR_TARGET = ` \
-  if [ -f $$r/binutils/windres ] ; then \
-    echo $$r/binutils/windres ; \
+GCJ_FOR_TARGET = @GCJ_FOR_TARGET@
+
+LD_FOR_TARGET=@LD_FOR_TARGET@
+USUAL_LD_FOR_TARGET = ` \
+  if [ -f $$r/ld/ld-new ] ; then \
+    echo $$r/ld/ld-new ; \
+  elif [ -f $$r/gcc/xgcc ]; then \
+    $(CC_FOR_TARGET) -print-prog-name=ld ; \

   else \
   else \

-    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-      echo $(WINDRES); \
+    if [ '$(host)' = '$(target)' ] ; then \
+      echo $(LD); \

     else \
     else \

-       t='$(program_transform_name)'; echo windres | sed -e 's/x/x/' $$t ; \
+       echo ld | sed '$(program_transform_name)' ; \

     fi; \
   fi`
 
     fi; \
   fi`
 

-AR_FOR_TARGET=@AR_FOR_TARGET@
-USUAL_AR_FOR_TARGET = ` \
-  if [ -f $$r/binutils/ar ] ; then \
-    echo $$r/binutils/ar ; \
+LDFLAGS_FOR_TARGET = 
+
+NM_FOR_TARGET=@NM_FOR_TARGET@
+USUAL_NM_FOR_TARGET = ` \
+  if [ -f $$r/binutils/nm-new ] ; then \
+    echo $$r/binutils/nm-new ; \
+  elif [ -f $$r/gcc/xgcc ]; then \
+    $(CC_FOR_TARGET) -print-prog-name=nm ; \

   else \
   else \

-    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-      echo $(AR); \
+    if [ '$(host)' = '$(target)' ] ; then \
+      echo $(NM); \

     else \
     else \

-       t='$(program_transform_name)'; echo ar | sed -e 's/x/x/' $$t ; \
+       echo nm | sed '$(program_transform_name)' ; \

     fi; \
   fi`
 
     fi; \
   fi`
 


@@ -341,31 +345,35 @@ USUAL_RANLIB_FOR_TARGET = ` \
   if [ -f $$r/binutils/ranlib ] ; then \
     echo $$r/binutils/ranlib ; \
   else \
   if [ -f $$r/binutils/ranlib ] ; then \
     echo $$r/binutils/ranlib ; \
   else \

-    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+    if [ '$(host)' = '$(target)' ] ; then \

       if [ x'$(RANLIB)' != x ]; then \
          echo $(RANLIB); \
       else \
          echo ranlib; \
       fi; \
     else \
       if [ x'$(RANLIB)' != x ]; then \
          echo $(RANLIB); \
       else \
          echo ranlib; \
       fi; \
     else \

-       t='$(program_transform_name)'; echo ranlib | sed -e 's/x/x/' $$t ; \
+       echo ranlib | sed '$(program_transform_name)' ; \

     fi; \
   fi`
 
     fi; \
   fi`
 

-NM_FOR_TARGET=@NM_FOR_TARGET@
-USUAL_NM_FOR_TARGET = ` \
-  if [ -f $$r/binutils/nm-new ] ; then \
-    echo $$r/binutils/nm-new ; \
-  elif [ -f $$r/gcc/xgcc ]; then \
-    $(CC_FOR_TARGET) -print-prog-name=nm ; \
+WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
+USUAL_WINDRES_FOR_TARGET = ` \
+  if [ -f $$r/binutils/windres ] ; then \
+    echo $$r/binutils/windres ; \

   else \
   else \

-    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-      echo $(NM); \
+    if [ '$(host)' = '$(target)' ] ; then \
+      echo $(WINDRES); \

     else \
     else \

-       t='$(program_transform_name)'; echo nm | sed -e 's/x/x/' $$t ; \
+       echo windres | sed '$(program_transform_name)' ; \

     fi; \
   fi`
 
     fi; \
   fi`
 

+PICFLAG_FOR_TARGET = 
+
+# ------------------------------------
+# Miscellaneous targets and flag lists
+# ------------------------------------
+

 # The first rule in the file had better be this one.  Don't put any above it.
 # This lives here to allow makefile fragments to contain dependencies.
 all: all.normal
 # The first rule in the file had better be this one.  Don't put any above it.
 # This lives here to allow makefile fragments to contain dependencies.
 all: all.normal


@@ -379,69 +387,10 @@ all: all.normal
 ###
 
 # Flags to pass down to all sub-makes.
 ###
 
 # Flags to pass down to all sub-makes.

-# Please keep these in alphabetical order.
-BASE_FLAGS_TO_PASS = \
-       "AR_FLAGS=$(AR_FLAGS)" \
-       "AR_FOR_TARGET=$(AR_FOR_TARGET)" \
-       "AS_FOR_TARGET=$(AS_FOR_TARGET)" \
-       "BISON=$(BISON)" \
-       "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
-       "CC_FOR_TARGET=$(CC_FOR_TARGET)" \
-       "CFLAGS=$(CFLAGS)" \
-       "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
-       "GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \
-       "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
-       "CXXFLAGS=$(CXXFLAGS)" \
-       "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
-       "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
-       "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
-       "INSTALL=$(INSTALL)" \
-       "INSTALL_DATA=$(INSTALL_DATA)" \
-       "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
-       "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
-       "LDFLAGS=$(LDFLAGS)" \
-       "LEX=$(LEX)" \
-       "LD_FOR_TARGET=$(LD_FOR_TARGET)" \
-       "LIBCFLAGS=$(LIBCFLAGS)" \
-       "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
-       "LIBCXXFLAGS=$(LIBCXXFLAGS)" \
-       "LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \
-       "M4=$(M4)" \
-       "MAKE=$(MAKE)" \
-       "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
-       "NM_FOR_TARGET=$(NM_FOR_TARGET)" \
-       "RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
-       "RPATH_ENVVAR=$(RPATH_ENVVAR)" \
-       "SHELL=$(SHELL)" \
-       "EXPECT=$(EXPECT)" \
-       "RUNTEST=$(RUNTEST)" \
-       "RUNTESTFLAGS=$(RUNTESTFLAGS)" \
-       "TARGET_SUBDIR=$(TARGET_SUBDIR)" \
-       "WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
-       "YACC=$(YACC)" \
-       "bindir=$(bindir)" \
-       "datadir=$(datadir)" \
-       "exec_prefix=$(exec_prefix)" \
-       "includedir=$(includedir)" \
-       "infodir=$(infodir)" \
-       "libdir=$(libdir)" \
-       "libexecdir=$(libexecdir)" \
-       "lispdir=$(lispdir)" \
-       "libstdcxx_incdir=$(libstdcxx_incdir)" \
-       "libsubdir=$(libsubdir)" \
-       "localstatedir=$(localstatedir)" \
-       "mandir=$(mandir)" \
-       "oldincludedir=$(oldincludedir)" \
-       "prefix=$(prefix)" \
-       "sbindir=$(sbindir)" \
-       "sharedstatedir=$(sharedstatedir)" \
-       "sysconfdir=$(sysconfdir)" \
-       "tooldir=$(tooldir)" \
-       "build_tooldir=$(build_tooldir)" \
-       "gxx_include_dir=$(gxx_include_dir)" \
-       "gcc_version=$(gcc_version)" \
-       "gcc_version_trigger=$(gcc_version_trigger)" \
-       "target_alias=$(target_alias)" 
+BASE_FLAGS_TO_PASS = [+ FOR flags_to_pass +]\
+       "[+flag+]=$([+flag+])" [+ ENDFOR flags_to_pass +]\
+       "CONFIG_SHELL=$(SHELL)" \
+       "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 

 
 # For any flags above that may contain shell code that varies from one
 # target library to another.  When doing recursive invocations of the
 
 # For any flags above that may contain shell code that varies from one
 # target library to another.  When doing recursive invocations of the


@@ -454,7 +403,6 @@ RECURSE_FLAGS = \
 
 # Flags to pass down to most sub-makes, in which we're building with
 # the host environment.
 
 # Flags to pass down to most sub-makes, in which we're building with
 # the host environment.

-# If any variables are added here, they must be added to do-*, below.

 EXTRA_HOST_FLAGS = \
        'AR=$(AR)' \
        'AS=$(AS)' \
 EXTRA_HOST_FLAGS = \
        'AR=$(AR)' \
        'AS=$(AS)' \


@@ -463,7 +411,7 @@ EXTRA_HOST_FLAGS = \
        'DLLTOOL=$(DLLTOOL)' \
        'LD=$(LD)' \
        'NM=$(NM)' \
        'DLLTOOL=$(DLLTOOL)' \
        'LD=$(LD)' \
        'NM=$(NM)' \

-       "`echo 'RANLIB=$(RANLIB)' | sed -e s/.*=$$/XFOO=/`" \
+       'RANLIB=$(RANLIB)' \

        'WINDRES=$(WINDRES)'
 
 FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
        'WINDRES=$(WINDRES)'
 
 FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)


@@ -483,7 +431,6 @@ X11_FLAGS_TO_PASS = \
 # Flags to pass down to makes which are built with the target environment.
 # The double $ decreases the length of the command line; the variables
 # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.
 # Flags to pass down to makes which are built with the target environment.
 # The double $ decreases the length of the command line; the variables
 # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.

-# If any variables are added here, they must be added to do-*, below.

 EXTRA_TARGET_FLAGS = \
        'AR=$$(AR_FOR_TARGET)' \
        'AS=$$(AS_FOR_TARGET)' \
 EXTRA_TARGET_FLAGS = \
        'AR=$$(AR_FOR_TARGET)' \
        'AS=$$(AS_FOR_TARGET)' \


@@ -505,123 +452,154 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
 # unfortunately needs the native compiler and the target ar and
 # ranlib.
 # If any variables are added here, they must be added to do-*, below.
 # unfortunately needs the native compiler and the target ar and
 # ranlib.
 # If any variables are added here, they must be added to do-*, below.

-# The HOST_* variables are a special case, which are used for the gcc
+# The BUILD_* variables are a special case, which are used for the gcc

 # cross-building scheme.
 EXTRA_GCC_FLAGS = \
 # cross-building scheme.
 EXTRA_GCC_FLAGS = \

-       'AR=$(AR)' \
-       'AS=$(AS)' \
-       'CC=$(CC)' \
-       'CXX=$(CXX)' \
-       'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
-       'BUILD_CC=$(CC_FOR_BUILD)' \

        'BUILD_PREFIX=$(BUILD_PREFIX)' \
        'BUILD_PREFIX_1=$(BUILD_PREFIX_1)' \
        'BUILD_PREFIX=$(BUILD_PREFIX)' \
        'BUILD_PREFIX_1=$(BUILD_PREFIX_1)' \

-       'NM=$(NM)' \
-       "`echo 'RANLIB=$(RANLIB)' | sed -e s/.*=$$/XFOO=/`" \
-       'WINDRES=$$(WINDRES_FOR_TARGET)' \

        "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
        "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
        "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
        "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \

-       "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s/.*=$$/XFOO=/`" \
-       "`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s/.*=$$/XFOO=/`" \
-       "`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s/.*=$$/XFOO=/`" \
-       "`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
-       "`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
-       "`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s/.*=$$/XFOO=/`" \
-       "`echo 'ENQUIRE=$(ENQUIRE)' | sed -e s/.*=$$/XFOO=/`" \
-       "`echo 'STAGE1_CFLAGS=$(STAGE1_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
-       "`echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)' | sed -e s/.*=$$/XFOO=/`"
-
-GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
-
-configure-host: @configure_host_modules@
-configure-target: @configure_target_modules@
-
-# This is a list of the targets for which we can do a clean-{target}.
-CLEAN_MODULES =[+
-    FOR host_modules +][+
-        IF (not (or (exist? "no_clean") (exist? "with_x"))) +] \
-       clean-[+module+][+
-        ENDIF no_clean +][+
-    ENDFOR host_modules +]
-
-# All of the target modules that can be cleaned
-CLEAN_TARGET_MODULES =[+
-    FOR target_modules +][+
-        IF (not (exist? "no_clean")) +] \
-       clean-target-[+module+][+
-        ENDIF no_clean +][+
-    ENDFOR target_modules +]
-
-# All of the x11 modules that can be cleaned
-CLEAN_X11_MODULES = [+ FOR host_modules +][+ IF with_x +]\
-       clean-[+module+] [+ ENDIF with_x +][+ ENDFOR host_modules +]
+       "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+       "`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+       "`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+       "`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+       "`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+       "`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+       "`echo 'STAGE1_CFLAGS=$(STAGE1_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+       "`echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+       "`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
+
+GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
+
+.PHONY: configure-host
+configure-host: maybe-configure-gcc [+
+  FOR host_modules +] \
+    maybe-configure-[+module+][+
+  ENDFOR host_modules +]
+.PHONY: configure-target
+configure-target: [+
+  FOR target_modules +] \
+    maybe-configure-target-[+module+][+
+  ENDFOR target_modules +]

 
 # The target built for a native build.
 
 # The target built for a native build.

-# This list only includes modules actually being configured and built.

 .PHONY: all.normal
 .PHONY: all.normal

-all.normal: @all_build_modules@ \
-       @all_host_modules@ \
-       @all_target_modules@
-
-all-host: @all_host_modules@
-all-target: @all_target_modules@
+all.normal: @all_build_modules@ all-host all-target
+
+.PHONY: all-host
+all-host: maybe-all-gcc [+
+  FOR host_modules +] \
+    maybe-all-[+module+][+
+  ENDFOR host_modules +]
+.PHONY: all-target
+all-target: [+
+  FOR target_modules +] \
+    maybe-all-target-[+module+][+
+  ENDFOR target_modules +]

 
 # Do a target for all the subdirectories.  A ``make do-X'' will do a
 # ``make X'' in all subdirectories (because, in general, there is a
 # dependency (below) of X upon do-X, a ``make X'' will also do this,
 # but it may do additional work as well).
 
 # Do a target for all the subdirectories.  A ``make do-X'' will do a
 # ``make X'' in all subdirectories (because, in general, there is a
 # dependency (below) of X upon do-X, a ``make X'' will also do this,
 # but it may do additional work as well).

-# This target ensures that $(BASE_FLAGS_TO_PASS) appears only once,
-# because it is so large that it can easily overflow the command line
-# length limit on some systems.

 [+ FOR recursive_targets +]
 [+ FOR recursive_targets +]

-.PHONY: do-[+target+]
-do-[+target+]:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+.PHONY: do-[+make_target+]
+do-[+make_target+]: [+make_target+]-host [+make_target+]-target
+
+.PHONY: [+make_target+]-host
+[+make_target+]-host: maybe-[+make_target+]-gcc [+
+  FOR host_modules +] \
+    maybe-[+make_target+]-[+module+][+
+  ENDFOR host_modules +]
+
+.PHONY: [+make_target+]-target
+[+make_target+]-target: [+
+  FOR target_modules +] \
+    maybe-[+make_target+]-target-[+module+][+
+  ENDFOR target_modules +]
+
+# GCC, the eternal special case
+.PHONY: maybe-[+make_target+]-gcc [+make_target+]-gcc
+maybe-[+make_target+]-gcc:
+[+make_target+]-gcc: [+
+  FOR depend +]\
+    [+depend+]-gcc [+
+  ENDFOR depend +]
+       @[ -f ./gcc/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \

        $(SET_LIB_PATH) \
        $(SET_LIB_PATH) \

-       for i in $(SUBDIRS) -dummy-; do \
-         if [ -f ./$$i/Makefile ]; then \
-           case $$i in \
-           gcc) \
-             for flag in $(EXTRA_GCC_FLAGS); do \
-               eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-             done; \
-             ;; \
-           *) \
-             for flag in $(EXTRA_HOST_FLAGS); do \
-               eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-             done; \
-             ;; \
-           esac ; \
-           (cd ./$$i && \
-               $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                       "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
-                       "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       [+target+]) \
-           || exit 1; \
-         else true; fi; \
-       done
-       # Break into two pieces
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       for flag in $(EXTRA_GCC_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing [+make_target+] in gcc" ; \
+       (cd gcc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 [+make_target+]) \
+         || exit 1
+
+# Host modules.
+[+ FOR host_modules +]
+.PHONY: maybe-[+make_target+]-[+module+] [+make_target+]-[+module+]
+maybe-[+make_target+]-[+module+]:
+[+ IF (match-value? = "missing" (get "make_target") ) +]
+# [+module+] doesn't support [+make_target+].
+[+make_target+]-[+module+]:
+[+ ELSE +]
+[+make_target+]-[+module+]: [+
+  FOR depend +]\
+    [+depend+]-[+module+] [+
+  ENDFOR depend +]
+       @[ -f ./[+module+]/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \

        $(SET_LIB_PATH) \
        $(SET_LIB_PATH) \

-       for i in $(TARGET_CONFIGDIRS) -dummy-; do \
-         if [ -f $(TARGET_SUBDIR)/$$i/Makefile ]; then \
-           for flag in $(EXTRA_TARGET_FLAGS); do \
-               eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-           done; \
-           (cd $(TARGET_SUBDIR)/$$i && \
-               $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                       "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
-                       "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       [+target+]) \
-           || exit 1; \
-         else true; fi; \
-       done
-[+ ENDFOR recursive_targets +]
+       for flag in $(EXTRA_HOST_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing [+make_target+] in [+module+]" ; \
+       (cd [+module+] && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 [+make_target+]) \
+         || exit 1
+[+ ENDIF +]
+[+ ENDFOR host_modules +]

 
 

+# Target modules.
+[+ FOR target_modules +]
+.PHONY: maybe-[+make_target+]-target-[+module+] [+make_target+]-target-[+module+]
+maybe-[+make_target+]-target-[+module+]:
+[+ IF (match-value? = "missing" (get "make_target") ) +]
+# [+module+] doesn't support [+make_target+].
+[+make_target+]-target-[+module+]:
+[+ ELSE +]
+[+make_target+]-target-[+module+]: [+
+  FOR depend +]\
+    [+depend+]-target-[+module+] [+
+  ENDFOR depend +]
+       @[ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       echo "Doing [+make_target+] in $(TARGET_SUBDIR)/[+module+]" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/[+module+] && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 [+make_target+]) \
+         || exit 1
+[+ ENDIF +]
+[+ ENDFOR target_modules +]
+[+ ENDFOR recursive_targets +]

 
 # Here are the targets which correspond to the do-X targets.
 
 
 # Here are the targets which correspond to the do-X targets.
 


@@ -637,9 +615,9 @@ dvi: do-dvi
 do-info: maybe-all-texinfo
 
 install-info: do-install-info dir.info
 do-info: maybe-all-texinfo
 
 install-info: do-install-info dir.info

-       s=`cd $(srcdir); ${PWD}`; export s; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \

        if [ -f dir.info ] ; then \
        if [ -f dir.info ] ; then \

-         $(INSTALL_DATA) dir.info $(infodir)/dir.info ; \
+         $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \

        else true ; fi
 
 local-clean:
        else true ; fi
 
 local-clean:


@@ -647,10 +625,11 @@ local-clean:
 
 local-distclean:
        -rm -f Makefile config.status config.cache mh-frag mt-frag
 
 local-distclean:
        -rm -f Makefile config.status config.cache mh-frag mt-frag

-       -rm -f multilib.out multilib.ts multilib.tmp maybedep.tmp serdep.tmp
+       -rm -f multilib.out multilib.tmp maybedep.tmp serdep.tmp

        -if [ "$(TARGET_SUBDIR)" != "." ]; then \
          rm -rf $(TARGET_SUBDIR); \
        else true; fi
        -if [ "$(TARGET_SUBDIR)" != "." ]; then \
          rm -rf $(TARGET_SUBDIR); \
        else true; fi

+       -rm -rf $(BUILD_SUBDIR)

        -rm -f texinfo/po/Makefile texinfo/po/Makefile.in texinfo/info/Makefile
        -rm -f texinfo/doc/Makefile texinfo/po/POTFILES
        -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
        -rm -f texinfo/po/Makefile texinfo/po/Makefile.in texinfo/info/Makefile
        -rm -f texinfo/doc/Makefile texinfo/po/POTFILES
        -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null


@@ -668,33 +647,8 @@ maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean
 maintainer-clean: local-distclean
 realclean: maintainer-clean
 
 maintainer-clean: local-distclean
 realclean: maintainer-clean
 

-# This rule is used to clean specific modules.
-.PHONY: $(CLEAN_MODULES) $(CLEAN_X11_MODULES) clean-gcc
-$(CLEAN_MODULES) $(CLEAN_X11_MODULES) clean-gcc:
-       @dir=`echo $@ | sed -e 's/clean-//'`; \
-       if [ -f ./$${dir}/Makefile ] ; then \
-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $${dir} && $(MAKE) $(FLAGS_TO_PASS) clean); \
-       else \
-         true; \
-       fi
-
-.PHONY: $(CLEAN_TARGET_MODULES)
-$(CLEAN_TARGET_MODULES):
-       @dir=`echo $@ | sed -e 's/clean-target-//'`; \
-       rm -f $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \
-       if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/$${dir} && $(MAKE) $(TARGET_FLAGS_TO_PASS) clean); \
-       else \
-         true; \
-       fi
-
-clean-target: $(CLEAN_TARGET_MODULES) clean-target-libgcc
+# Extra dependency for clean-target, owing to the mixed nature of gcc
+clean-target: clean-target-libgcc

 clean-target-libgcc:
        test ! -d gcc/libgcc || \
        (cd gcc/libgcc && find . -type d -print) | \
 clean-target-libgcc:
        test ! -d gcc/libgcc || \
        (cd gcc/libgcc && find . -type d -print) | \


@@ -704,12 +658,16 @@ clean-target-libgcc:
 # Check target.
 
 .PHONY: check do-check
 # Check target.
 
 .PHONY: check do-check

-check:
-       $(MAKE) do-check NOTPARALLEL=parallel-ok
+check: do-check

 
 # Only include modules actually being configured and built.
 
 # Only include modules actually being configured and built.

-do-check: @check_host_modules@ \
-       @check_target_modules@
+do-check: maybe-check-gcc [+
+  FOR host_modules +] \
+    maybe-check-[+module+][+
+  ENDFOR host_modules +][+
+  FOR target_modules +] \
+    maybe-check-target-[+module+][+
+  ENDFOR target_modules +]

 
 # Automated reporting of test results.
 
 
 # Automated reporting of test results.
 


@@ -735,9 +693,25 @@ mail-report-with-warnings.log: warning.log
 # Installation targets.
 
 .PHONY: install uninstall
 # Installation targets.
 
 .PHONY: install uninstall

-install: installdirs @install_host_modules@ @install_target_modules@
-
-install-target: @install_target_modules@
+install: installdirs install-host install-target
+
+.PHONY: install-host-nogcc
+install-host-nogcc: [+
+  FOR host_modules +] \
+    maybe-install-[+module+][+
+  ENDFOR host_modules +]
+
+.PHONY: install-host
+install-host: maybe-install-gcc [+
+  FOR host_modules +] \
+    maybe-install-[+module+][+
+  ENDFOR host_modules +]
+
+.PHONY: install-target
+install-target: [+
+  FOR target_modules +] \
+    maybe-install-target-[+module+][+
+  ENDFOR target_modules +]

 
 uninstall:
        @echo "the uninstall target is not supported in this tree"
 
 uninstall:
        @echo "the uninstall target is not supported in this tree"


@@ -745,7 +719,7 @@ uninstall:
 .PHONY: install.all
 install.all: install-no-fixedincludes
        @if [ -f ./gcc/Makefile ] ; then \
 .PHONY: install.all
 install.all: install-no-fixedincludes
        @if [ -f ./gcc/Makefile ] ; then \

-               r=`${PWD}` ; export r ; \
+               r=`${PWD_COMMAND}` ; export r ; \

                $(SET_LIB_PATH) \
                (cd ./gcc && \
                $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
                $(SET_LIB_PATH) \
                (cd ./gcc && \
                $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \


@@ -756,8 +730,8 @@ install.all: install-no-fixedincludes
 # install-no-fixedincludes is used because Cygnus can not distribute
 # the fixed header files.
 .PHONY: install-no-fixedincludes
 # install-no-fixedincludes is used because Cygnus can not distribute
 # the fixed header files.
 .PHONY: install-no-fixedincludes

-install-no-fixedincludes: installdirs @install_host_modules_nogcc@ \
-       @install_target_modules@ gcc-no-fixedincludes
+install-no-fixedincludes: installdirs install-host-nogcc \
+       install-target gcc-no-fixedincludes

 
 ### other supporting targets
 
 
 ### other supporting targets
 


@@ -770,7 +744,7 @@ installdirs: mkinstalldirs
 
 dir.info: do-install-info
        if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \
 
 dir.info: do-install-info
        if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \

-         $(srcdir)/texinfo/gen-info-dir $(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \
+         $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \

          mv -f dir.info.new dir.info ; \
        else true ; \
        fi
          mv -f dir.info.new dir.info ; \
        else true ; \
        fi


@@ -795,71 +769,72 @@ TAGS: do-TAGS
 [+ FOR build_modules +]
 .PHONY: configure-build-[+module+] maybe-configure-build-[+module+]
 maybe-configure-build-[+module+]:
 [+ FOR build_modules +]
 .PHONY: configure-build-[+module+] maybe-configure-build-[+module+]
 maybe-configure-build-[+module+]:

-configure-build-[+module+]: $(BUILD_SUBDIR)/[+module+]/Makefile
-$(BUILD_SUBDIR)/[+module+]/Makefile: config.status
-       @[ -d $(BUILD_SUBDIR)/[+module+] ] || mkdir $(BUILD_SUBDIR)/[+module+];\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           AR="$(AR_FOR_BUILD)"; export AR; \
-           AS="$(AS_FOR_BUILD)"; export AS; \
-           CC="$(CC_FOR_BUILD)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
-           CXX="$(CXX_FOR_BUILD)"; export CXX; \
-           CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
-           LD="$(LD_FOR_BUILD)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
-           NM="$(NM_FOR_BUILD)"; export NM; \
-           RANLIB="$(RANLIB_FOR_BUILD)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \
-           echo Configuring in $(BUILD_SUBDIR)/[+module+]; \
-           cd "$(BUILD_SUBDIR)/[+module+]" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(BUILD_SUBDIR)" in \
+configure-build-[+module+]:
+       @test ! -f $(BUILD_SUBDIR)/[+module+]/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/[+module+] ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       AR="$(AR_FOR_BUILD)"; export AR; \
+       AS="$(AS_FOR_BUILD)"; export AS; \
+       CC="$(CC_FOR_BUILD)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+       CXX="$(CXX_FOR_BUILD)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
+       LD="$(LD_FOR_BUILD)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
+       NM="$(NM_FOR_BUILD)"; export NM; \
+       RANLIB="$(RANLIB_FOR_BUILD)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \
+       echo Configuring in $(BUILD_SUBDIR)/[+module+]; \
+       cd "$(BUILD_SUBDIR)/[+module+]" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(BUILD_SUBDIR)" in \

              .) topdir="../$(srcdir)" ;; \
              *) topdir="../../$(srcdir)" ;; \
              .) topdir="../$(srcdir)" ;; \
              *) topdir="../../$(srcdir)" ;; \

-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(BUILD_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(BUILD_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \

              else \
              else \

-               true; \
+               true; \

              fi; \
              fi; \

-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \

            else \
            else \

-             srcdiroption="--srcdir=$${topdir}/[+module+]"; \
-             libsrcdir="$$s/[+module+]"; \
+             exit 1; \

            fi; \
            fi; \

-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(BUILD_CONFIGARGS) $${srcdiroption} \
-             --with-build-subdir="$(BUILD_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/[+module+]"; \
+         libsrcdir="$$s/[+module+]"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)" \
+         || exit 1

 
 .PHONY: all-build-[+module+] maybe-all-build-[+module+]
 maybe-all-build-[+module+]:
 all-build-[+module+]: configure-build-[+module+]
 
 .PHONY: all-build-[+module+] maybe-all-build-[+module+]
 maybe-all-build-[+module+]:
 all-build-[+module+]: configure-build-[+module+]

-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         (cd $(BUILD_SUBDIR)/[+module+] && $(MAKE) all)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       (cd $(BUILD_SUBDIR)/[+module+] && $(MAKE) all)

 [+ ENDFOR build_modules +]
 
 # --------------------------------------
 [+ ENDFOR build_modules +]
 
 # --------------------------------------


@@ -868,28 +843,26 @@ all-build-[+module+]: configure-build-[+module+]
 [+ FOR host_modules +]
 .PHONY: configure-[+module+] maybe-configure-[+module+]
 maybe-configure-[+module+]:
 [+ FOR host_modules +]
 .PHONY: configure-[+module+] maybe-configure-[+module+]
 maybe-configure-[+module+]:

-configure-[+module+]: [+module+]/Makefile
-
-[+module+]/Makefile: config.status
-       @[ -d [+module+] ] || mkdir [+module+]; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+configure-[+module+]:
+       @test ! -f [+module+]/Makefile || exit 0; \
+       [ -d [+module+] ] || mkdir [+module+]; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \

        CC="$(CC)"; export CC; \
        CFLAGS="$(CFLAGS)"; export CFLAGS; \
        CC="$(CC)"; export CC; \
        CFLAGS="$(CFLAGS)"; export CFLAGS; \

+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \

        CXX="$(CXX)"; export CXX; \
        CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
        CXX="$(CXX)"; export CXX; \
        CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \

-       if [ z$(build_canonical) !=  z$(host_canoncial) ] ; then \
-         AR="$(AR)"; export AR; \
-         AS="$(AS)"; export AS; \
-         CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-         DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
-         LD="$(LD)"; export LD; \
-         NM="$(NM)"; export NM; \
-         RANLIB="$(RANLIB)"; export RANLIB; \
-         WINDRES="$(WINDRES)"; export WINDRES; \
-         OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-         OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       fi; \
+       AR="$(AR)"; export AR; \
+       AS="$(AS)"; export AS; \
+       CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
+       DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
+       LD="$(LD)"; export LD; \
+       NM="$(NM)"; export NM; \
+       RANLIB="$(RANLIB)"; export RANLIB; \
+       WINDRES="$(WINDRES)"; export WINDRES; \
+       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
+       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \

        echo Configuring in [+module+]; \
        cd [+module+] || exit 1; \
        case $(srcdir) in \
        echo Configuring in [+module+]; \
        cd [+module+] || exit 1; \
        case $(srcdir) in \


@@ -910,57 +883,54 @@ configure-[+module+]: [+module+]/Makefile
 .PHONY: all-[+module+] maybe-all-[+module+]
 maybe-all-[+module+]:
 all-[+module+]: configure-[+module+]
 .PHONY: all-[+module+] maybe-all-[+module+]
 maybe-all-[+module+]:
 all-[+module+]: configure-[+module+]

-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ 
-           IF with_x 
-             +] $(X11_FLAGS_TO_PASS)[+ 
-           ENDIF with_x +] all)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ 
+         IF with_x 
+           +] $(X11_FLAGS_TO_PASS)[+ 
+         ENDIF with_x +] all)

 
 

+.PHONY: check-[+module+] maybe-check-[+module+]
+maybe-check-[+module+]:

 [+ IF no_check +]
 [+ IF no_check +]

-.PHONY: check-[+module+]

 check-[+module+]:
 [+ ELIF no_check_cross +]
 check-[+module+]:
 [+ ELIF no_check_cross +]

-.PHONY: check-[+module+]

 # This module is only tested in a native toolchain.
 check-[+module+]:
 # This module is only tested in a native toolchain.
 check-[+module+]:

-       @if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ 
-             IF with_x 
-               +] $(X11_FLAGS_TO_PASS)[+ 
-             ENDIF with_x +] check); \
-       fi
-[+ ELSE check +]
-.PHONY: check-[+module+]
-check-[+module+]:
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+       @if [ '$(host)' = '$(target)' ] ; then \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \

          $(SET_LIB_PATH) \
          (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ 
            IF with_x 
              +] $(X11_FLAGS_TO_PASS)[+ 
          $(SET_LIB_PATH) \
          (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ 
            IF with_x 
              +] $(X11_FLAGS_TO_PASS)[+ 

-           ENDIF with_x +] check)
+           ENDIF with_x +] check); \
+       fi
+[+ ELSE check +]
+check-[+module+]:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ 
+         IF with_x 
+           +] $(X11_FLAGS_TO_PASS)[+ 
+         ENDIF with_x +] check)

 [+ ENDIF no_check +]
 
 [+ ENDIF no_check +]
 

-[+ IF no_install +]

 .PHONY: install-[+module+] maybe-install-[+module+]
 maybe-install-[+module+]:
 .PHONY: install-[+module+] maybe-install-[+module+]
 maybe-install-[+module+]:

+[+ IF no_install +]

 install-[+module+]:
 [+ ELSE install +]
 install-[+module+]:
 [+ ELSE install +]

-.PHONY: install-[+module+] maybe-install-[+module+]
-maybe-install-[+module+]:

 install-[+module+]: installdirs
 install-[+module+]: installdirs

-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ 
-           IF with_x 
-             +] $(X11_FLAGS_TO_PASS)[+ 
-           ENDIF with_x +] install)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ 
+         IF with_x 
+           +] $(X11_FLAGS_TO_PASS)[+ 
+         ENDIF with_x +] install)

 [+ ENDIF no_install +]
 [+ ENDFOR host_modules +]
 
 [+ ENDIF no_install +]
 [+ ENDFOR host_modules +]
 


@@ -970,120 +940,123 @@ install-[+module+]: installdirs
 [+ FOR target_modules +]
 .PHONY: configure-target-[+module+] maybe-configure-target-[+module+]
 maybe-configure-target-[+module+]:
 [+ FOR target_modules +]
 .PHONY: configure-target-[+module+] maybe-configure-target-[+module+]
 maybe-configure-target-[+module+]:

-configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/Makefile

 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
 $(TARGET_SUBDIR)/[+module+]/multilib.out: multilib.out
 
 # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
 $(TARGET_SUBDIR)/[+module+]/multilib.out: multilib.out

-       @[ -d $(TARGET_SUBDIR)/[+module+] ] || mkdir $(TARGET_SUBDIR)/[+module+];\
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/[+module+] ; \
+       rm -f $(TARGET_SUBDIR)/[+module+]/Makefile || : ; \

        cp multilib.out $(TARGET_SUBDIR)/[+module+]/multilib.out
 
        cp multilib.out $(TARGET_SUBDIR)/[+module+]/multilib.out
 

-$(TARGET_SUBDIR)/[+module+]/Makefile: config.status $(TARGET_SUBDIR)/[+module+]/multilib.out
-       @[ -d $(TARGET_SUBDIR)/[+module+] ] || mkdir $(TARGET_SUBDIR)/[+module+];\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           AR="$(AR_FOR_TARGET)"; export AR; \
-           AS="$(AS_FOR_TARGET)"; export AS; \
-           CC="$(CC_FOR_TARGET)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \[+ 
-       IF raw_cxx +]
-           CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
-           CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; \[+ 
-       ELSE normal_cxx +]
-           CXX="$(CXX_FOR_TARGET)"; export CXX; \[+ 
-       ENDIF raw_cxx +]
-           CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-           LD="$(LD_FOR_TARGET)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-           NM="$(NM_FOR_TARGET)"; export NM; \
-           RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-           echo Configuring in $(TARGET_SUBDIR)/[+module+]; \
-           cd "$(TARGET_SUBDIR)/[+module+]" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(TARGET_SUBDIR)" in \
+configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/[+module+]/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/[+module+] ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       AR="$(AR_FOR_TARGET)"; export AR; \
+       AS="$(AS_FOR_TARGET)"; export AS; \
+       CC="$(CC_FOR_TARGET)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \[+ 
+IF raw_cxx +]
+       CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
+       CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; \[+ 
+ELSE normal_cxx +]
+       CXX="$(CXX_FOR_TARGET)"; export CXX; \[+ 
+ENDIF raw_cxx +]
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+       LD="$(LD_FOR_TARGET)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+       NM="$(NM_FOR_TARGET)"; export NM; \
+       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       echo Configuring in $(TARGET_SUBDIR)/[+module+]; \
+       cd "$(TARGET_SUBDIR)/[+module+]" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \

              .) topdir="../$(srcdir)" ;; \
              *) topdir="../../$(srcdir)" ;; \
              .) topdir="../$(srcdir)" ;; \
              *) topdir="../../$(srcdir)" ;; \

-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \[+ IF stage +]
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \

              else \
              else \

-               true; \
+               true; \

              fi; \
              fi; \

-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \

            else \
            else \

-             srcdiroption="--srcdir=$${topdir}/[+module+]"; \
-             libsrcdir="$$s/[+module+]"; \
+             exit 1; \

            fi; \
            fi; \

-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(TARGET_CONFIGARGS) $${srcdiroption} \
-             --with-target-subdir="$(TARGET_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \[+ ENDIF stage +]
+         srcdiroption="--srcdir=$${topdir}/[+module+]"; \
+         libsrcdir="$$s/[+module+]"; \[+ IF stage +]
+       fi; \[+ ENDIF stage +]
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" \
+         || exit 1

 
 .PHONY: all-target-[+module+] maybe-all-target-[+module+]
 maybe-all-target-[+module+]:
 all-target-[+module+]: configure-target-[+module+]
 
 .PHONY: all-target-[+module+] maybe-all-target-[+module+]
 maybe-all-target-[+module+]:
 all-target-[+module+]: configure-target-[+module+]

-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/[+module+] && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS) [+
-              IF raw_cxx 
-                +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ 
-              ENDIF raw_cxx 
-           +] all)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/[+module+] && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) [+
+           IF raw_cxx 
+         +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ 
+           ENDIF raw_cxx 
+         +] all)
+
+.PHONY: check-target-[+module+] maybe-check-target-[+module+]
+maybe-check-target-[+module+]:

 [+ IF no_check +]
 # Dummy target for uncheckable module.
 [+ IF no_check +]
 # Dummy target for uncheckable module.

-.PHONY: check-target-[+module+]

 check-target-[+module+]:
 [+ ELSE check +]
 check-target-[+module+]:
 [+ ELSE check +]

-.PHONY: check-target-[+module+]

 check-target-[+module+]:
 check-target-[+module+]:

-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/[+module+] && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS) [+
-              IF raw_cxx 
-                +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ 
-              ENDIF raw_cxx 
-           +] check)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/[+module+] && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) [+
+           IF raw_cxx 
+             +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ 
+           ENDIF raw_cxx 
+         +] check)

 [+ ENDIF no_check +]
 [+ ENDIF no_check +]

-[+ IF no_install +]
+

 .PHONY: install-target-[+module+] maybe-install-target-[+module+]
 maybe-install-target-[+module+]:
 .PHONY: install-target-[+module+] maybe-install-target-[+module+]
 maybe-install-target-[+module+]:

+[+ IF no_install +]

 # Dummy target for uninstallable.
 install-target-[+module+]:
 [+ ELSE install +]
 # Dummy target for uninstallable.
 install-target-[+module+]:
 [+ ELSE install +]

-.PHONY: install-target-[+module+] maybe-install-target-[+module+]
-maybe-install-target-[+module+]:

 install-target-[+module+]: installdirs
 install-target-[+module+]: installdirs

-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/[+module+] && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/[+module+] && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)

 [+ ENDIF no_install +]
 [+ ENDFOR target_modules +]
 
 [+ ENDIF no_install +]
 [+ ENDFOR target_modules +]
 


@@ -1096,30 +1069,32 @@ install-target-[+module+]: installdirs
 # build modules.  So GCC is a sort of hybrid.
 
 # gcc is the only module which uses GCC_FLAGS_TO_PASS.
 # build modules.  So GCC is a sort of hybrid.
 
 # gcc is the only module which uses GCC_FLAGS_TO_PASS.

+# Don't use shared host config.cache, as it will confuse later
+# directories; GCC wants slightly different values for some
+# precious variables.  *sigh*

 .PHONY: configure-gcc maybe-configure-gcc
 maybe-configure-gcc:
 .PHONY: configure-gcc maybe-configure-gcc
 maybe-configure-gcc:

-configure-gcc: gcc/Makefile
-
-gcc/Makefile: config.status
-       @[ -d gcc ] || mkdir gcc; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+configure-gcc:
+       @test ! -f gcc/Makefile || exit 0; \
+       [ -d gcc ] || mkdir gcc; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \

        CC="$(CC)"; export CC; \
        CFLAGS="$(CFLAGS)"; export CFLAGS; \
        CC="$(CC)"; export CC; \
        CFLAGS="$(CFLAGS)"; export CFLAGS; \

+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \

        CXX="$(CXX)"; export CXX; \
        CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
        CXX="$(CXX)"; export CXX; \
        CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \

-       if [ z$(build_canonical) !=  z$(host_canoncial) ] ; then \
-         AR="$(AR)"; export AR; \
-         AS="$(AS)"; export AS; \
-         CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-         DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
-         LD="$(LD)"; export LD; \
-         NM="$(NM)"; export NM; \
-         RANLIB="$(RANLIB)"; export RANLIB; \
-         WINDRES="$(WINDRES)"; export WINDRES; \
-         OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-         OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       fi; \
+       TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
+       AR="$(AR)"; export AR; \
+       AS="$(AS)"; export AS; \
+       CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
+       DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
+       LD="$(LD)"; export LD; \
+       NM="$(NM)"; export NM; \
+       RANLIB="$(RANLIB)"; export RANLIB; \
+       WINDRES="$(WINDRES)"; export WINDRES; \
+       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
+       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \

        echo Configuring in gcc; \
        cd gcc || exit 1; \
        case $(srcdir) in \
        echo Configuring in gcc; \
        cd gcc || exit 1; \
        case $(srcdir) in \


@@ -1144,13 +1119,13 @@ gcc/Makefile: config.status
 maybe-all-gcc:
 all-gcc: configure-gcc
        @if [ -f gcc/stage_last ] ; then \
 maybe-all-gcc:
 all-gcc: configure-gcc
        @if [ -f gcc/stage_last ] ; then \

-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \

          $(SET_LIB_PATH) \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
        else \
          $(SET_LIB_PATH) \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
        else \

-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \

          $(SET_LIB_PATH) \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
        fi
          $(SET_LIB_PATH) \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
        fi


@@ -1165,54 +1140,76 @@ all-gcc: configure-gcc
 # In theory, on an SMP all those dependencies can be resolved
 # in parallel.
 #
 # In theory, on an SMP all those dependencies can be resolved
 # in parallel.
 #

-.PHONY: bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
-bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap: all-bootstrap configure-gcc
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
+.PHONY: $(GCC_STRAP_TARGETS)
+$(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \

        $(SET_LIB_PATH) \
        echo "Bootstrapping the compiler"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@
        $(SET_LIB_PATH) \
        echo "Bootstrapping the compiler"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@

-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \

        case "$@" in \
          *bootstrap4-lean ) \
        case "$@" in \
          *bootstrap4-lean ) \

-                       msg="Comparing stage3 and stage4 of the compiler"; \
-                       compare=compare3-lean ;; \
-         *bootstrap4 ) msg="Comparing stage3 and stage4 of the compiler"; \
-                       compare=compare3 ;; \
-         *-lean )      msg="Comparing stage2 and stage3 of the compiler"; \
-                       compare=compare-lean ;; \
-         * )           msg="Comparing stage2 and stage3 of the compiler"; \
-                       compare=compare ;; \
+           msg="Comparing stage3 and stage4 of the compiler"; \
+           compare=compare3-lean ;; \
+         *bootstrap4 ) \
+           msg="Comparing stage3 and stage4 of the compiler"; \
+           compare=compare3 ;; \
+         *-lean ) \
+           msg="Comparing stage2 and stage3 of the compiler"; \
+           compare=compare-lean ;; \
+         * ) \
+           msg="Comparing stage2 and stage3 of the compiler"; \
+           compare=compare ;; \

        esac; \
        $(SET_LIB_PATH) \
        echo "$$msg"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
        esac; \
        $(SET_LIB_PATH) \
        echo "$$msg"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare

-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}` ; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \

        $(SET_LIB_PATH) \
        echo "Building runtime libraries"; \
        $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
 
        $(SET_LIB_PATH) \
        echo "Building runtime libraries"; \
        $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
 

+profiledbootstrap: all-bootstrap configure-gcc
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       echo "Bootstrapping the compiler"; \
+       cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
+       $(SET_LIB_PATH) \
+       echo "Building runtime libraries and training compiler"; \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       echo "Building feedback based compiler"; \
+       cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build
+

 .PHONY: cross
 cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
 .PHONY: cross
 cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld

-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \

        $(SET_LIB_PATH) \
        echo "Building the C and C++ compiler"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
        $(SET_LIB_PATH) \
        echo "Building the C and C++ compiler"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"

-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}` ; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \

        $(SET_LIB_PATH) \
        echo "Building runtime libraries"; \
        $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \
          LANGUAGES="c c++" all
 
        $(SET_LIB_PATH) \
        echo "Building runtime libraries"; \
        $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \
          LANGUAGES="c c++" all
 

-.PHONY: check-gcc
+.PHONY: check-gcc maybe-check-gcc
+maybe-check-gcc:

 check-gcc:
        @if [ -f ./gcc/Makefile ] ; then \
 check-gcc:
        @if [ -f ./gcc/Makefile ] ; then \

-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \

          $(SET_LIB_PATH) \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
        else \
          $(SET_LIB_PATH) \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
        else \


@@ -1222,8 +1219,8 @@ check-gcc:
 .PHONY: check-gcc-c++
 check-gcc-c++:
        @if [ -f ./gcc/Makefile ] ; then \
 .PHONY: check-gcc-c++
 check-gcc-c++:
        @if [ -f ./gcc/Makefile ] ; then \

-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \

          $(SET_LIB_PATH) \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
        else \
          $(SET_LIB_PATH) \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
        else \


@@ -1237,8 +1234,8 @@ check-c++: check-target-libstdc++-v3 check-gcc-c++
 maybe-install-gcc:
 install-gcc:
        @if [ -f ./gcc/Makefile ] ; then \
 maybe-install-gcc:
 install-gcc:
        @if [ -f ./gcc/Makefile ] ; then \

-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \

          $(SET_LIB_PATH) \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
        else \
          $(SET_LIB_PATH) \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
        else \


@@ -1257,8 +1254,8 @@ gcc-no-fixedincludes:
          cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \
          touch gcc/stmp-fixinc gcc/include/fixed; \
          rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
          cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \
          touch gcc/stmp-fixinc gcc/include/fixed; \
          rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \

-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}` ; export s; \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \

          $(SET_LIB_PATH) \
          (cd ./gcc && \
           $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
          $(SET_LIB_PATH) \
          (cd ./gcc && \
           $(MAKE) $(GCC_FLAGS_TO_PASS) install); \


@@ -1279,16 +1276,17 @@ gcc-no-fixedincludes:
 
 # Host modules specific to gcc.
 # GCC needs to identify certain tools.
 
 # Host modules specific to gcc.
 # GCC needs to identify certain tools.

-configure-gcc: maybe-configure-binutils maybe-configure-gas maybe-configure-ld maybe-configure-bison maybe-configure-flex
-all-gcc: maybe-all-libiberty maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib
+# GCC also needs the information exported by the intl configure script.
+configure-gcc: maybe-configure-intl maybe-configure-binutils maybe-configure-gas maybe-configure-ld maybe-configure-bison maybe-configure-flex
+all-gcc: maybe-all-libiberty maybe-all-intl maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib

 # This is a slightly kludgy method of getting dependencies on 
 # all-build-libiberty correct; it would be better to build it every time.
 all-gcc: maybe-all-build-libiberty
 # This is a slightly kludgy method of getting dependencies on 
 # all-build-libiberty correct; it would be better to build it every time.
 all-gcc: maybe-all-build-libiberty

-all-bootstrap: maybe-all-libiberty maybe-all-texinfo maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib
+all-bootstrap: maybe-all-libiberty maybe-all-intl maybe-all-texinfo maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib

 
 # Host modules specific to gdb.
 # GDB needs to know that the simulator is being built.
 
 # Host modules specific to gdb.
 # GDB needs to know that the simulator is being built.

-configure-gdb: maybe-configure-tcl maybe-configure-tk maybe-configure-sim
+configure-gdb: maybe-configure-itcl maybe-configure-tcl maybe-configure-tk maybe-configure-sim

 GDB_TK = @GDB_TK@
 all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK)
 install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui
 GDB_TK = @GDB_TK@
 all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK)
 install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui


@@ -1303,6 +1301,8 @@ all-binutils: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-flex
 # binutils might be on PATH, and they might need the shared opcodes
 # library.
 install-binutils: maybe-install-opcodes
 # binutils might be on PATH, and they might need the shared opcodes
 # library.
 install-binutils: maybe-install-opcodes

+# libopcodes depends on libbfd
+install-opcodes: maybe-install-bfd

 all-gas: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-intl
 all-gprof: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-intl
 all-ld: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-bison maybe-all-byacc maybe-all-flex maybe-all-intl
 all-gas: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-intl
 all-gprof: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-intl
 all-ld: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-bison maybe-all-byacc maybe-all-flex maybe-all-intl


@@ -1317,7 +1317,7 @@ all-itcl: maybe-all-tcl maybe-all-tk
 # We put install-tcl before install-itcl because itcl wants to run a
 # program on installation which uses the Tcl libraries.
 install-itcl: maybe-install-tcl
 # We put install-tcl before install-itcl because itcl wants to run a
 # program on installation which uses the Tcl libraries.
 install-itcl: maybe-install-tcl

-all-sid: maybe-all-tcl maybe-all-tk
+all-sid: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-tcl maybe-all-tk

 install-sid: maybe-install-tcl maybe-install-tk
 all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-readline maybe-configure-gdb
 configure-tk: maybe-configure-tcl
 install-sid: maybe-install-tcl maybe-install-tk
 all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-readline maybe-configure-gdb
 configure-tk: maybe-configure-tcl


@@ -1334,17 +1334,15 @@ all-diff: maybe-all-libiberty
 all-fastjar: maybe-all-zlib maybe-all-libiberty
 all-fileutils: maybe-all-libiberty
 all-flex: maybe-all-libiberty maybe-all-bison maybe-all-byacc
 all-fastjar: maybe-all-zlib maybe-all-libiberty
 all-fileutils: maybe-all-libiberty
 all-flex: maybe-all-libiberty maybe-all-bison maybe-all-byacc

-all-grep: maybe-all-libiberty

 all-gzip: maybe-all-libiberty
 all-hello: maybe-all-libiberty
 all-m4: maybe-all-libiberty maybe-all-texinfo
 all-gzip: maybe-all-libiberty
 all-hello: maybe-all-libiberty
 all-m4: maybe-all-libiberty maybe-all-texinfo

-all-make: maybe-all-libiberty
+all-make: maybe-all-libiberty maybe-all-intl

 all-patch: maybe-all-libiberty
 all-prms: maybe-all-libiberty
 all-recode: maybe-all-libiberty
 all-sed: maybe-all-libiberty
 all-send-pr: maybe-all-prms
 all-patch: maybe-all-libiberty
 all-prms: maybe-all-libiberty
 all-recode: maybe-all-libiberty
 all-sed: maybe-all-libiberty
 all-send-pr: maybe-all-prms

-all-snavigator: maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-db maybe-all-grep maybe-all-libgui

 all-tar: maybe-all-libiberty
 all-uudecode: maybe-all-libiberty
 
 all-tar: maybe-all-libiberty
 all-uudecode: maybe-all-libiberty
 


@@ -1356,6 +1354,7 @@ ALL_GCC_CXX = $(ALL_GCC_C) maybe-all-target-libstdc++-v3
 configure-target-boehm-gc: $(ALL_GCC_C) maybe-configure-target-qthreads
 configure-target-fastjar: maybe-configure-target-zlib
 all-target-fastjar: maybe-all-target-zlib maybe-all-target-libiberty
 configure-target-boehm-gc: $(ALL_GCC_C) maybe-configure-target-qthreads
 configure-target-fastjar: maybe-configure-target-zlib
 all-target-fastjar: maybe-all-target-zlib maybe-all-target-libiberty

+configure-target-libada: $(ALL_GCC_C)

 configure-target-libf2c: $(ALL_GCC_C)
 all-target-libf2c: maybe-all-target-libiberty
 configure-target-libffi: $(ALL_GCC_C) 
 configure-target-libf2c: $(ALL_GCC_C)
 all-target-libf2c: maybe-all-target-libiberty
 configure-target-libffi: $(ALL_GCC_C) 


@@ -1371,7 +1370,7 @@ configure-target-zlib: $(ALL_GCC_C)
 configure-target-examples: $(ALL_GCC_C)
 configure-target-libgloss: $(ALL_GCC)
 all-target-libgloss: maybe-configure-target-newlib
 configure-target-examples: $(ALL_GCC_C)
 configure-target-libgloss: $(ALL_GCC)
 all-target-libgloss: maybe-configure-target-newlib

-configure-target-libiberty: $(ALL_GCC_C)
+configure-target-libiberty: $(ALL_GCC)

 configure-target-libtermcap: $(ALL_GCC_C)
 configure-target-newlib: $(ALL_GCC)
 configure-target-rda: $(ALL_GCC_C)
 configure-target-libtermcap: $(ALL_GCC_C)
 configure-target-newlib: $(ALL_GCC)
 configure-target-rda: $(ALL_GCC_C)


@@ -1401,31 +1400,34 @@ configure-target-qthreads: $(ALL_GCC_C)
 # work around various timestamp bugs on some systems.
 # We use move-if-change so that it's only considered updated when it
 # actually changes, because it has to depend on a phony target.
 # work around various timestamp bugs on some systems.
 # We use move-if-change so that it's only considered updated when it
 # actually changes, because it has to depend on a phony target.

-multilib.out: multilib.ts
-       @if [ -f multilib.out ] ; then : else \
-         rm -f multilib.ts; $(MAKE) multilib.ts; \
-       fi
-
-multilib.ts: maybe-all-gcc
-       @r=`${PWD}`; export r; \
+multilib.out: maybe-all-gcc
+       @r=`${PWD_COMMAND}`; export r; \

        echo "Checking multilib configuration..."; \
        $(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \
        $(SHELL) $(srcdir)/move-if-change multilib.tmp multilib.out ; \
        echo "Checking multilib configuration..."; \
        $(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \
        $(SHELL) $(srcdir)/move-if-change multilib.tmp multilib.out ; \

-       echo timestamp > multilib.ts

 
 # Rebuilding Makefile.in, using autogen.
 
 # Rebuilding Makefile.in, using autogen.

-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
-       cd $(srcdir) && autogen Makefile.def
+AUTOGEN = autogen
+$(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
+       cd $(srcdir) && $(AUTOGEN) Makefile.def

 
 # Rebuilding Makefile.
 
 # Rebuilding Makefile.

-Makefile: Makefile.in configure $(gcc_version_trigger)
-       $(SHELL) ./config.status --recheck
+Makefile: $(srcdir)/Makefile.in config.status
+       CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+config.status: configure $(gcc_version_trigger)
+       CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck

 
 # Rebuilding configure.
 
 # Rebuilding configure.

-configure: configure.in
-       cd $(srcdir) && autoconf
-#
+AUTOCONF = autoconf
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
+       cd $(srcdir) && $(AUTOCONF)
+
+# ------------------------------
+# Special directives to GNU Make
+# ------------------------------

 
 

+# Don't pass command-line variables to submakes.

 .NOEXPORT:
 MAKEOVERRIDES=
 
 .NOEXPORT:
 MAKEOVERRIDES=