OSDN Git Service

Fix typo. Name of fourth arg is 'fndecl' not 'indirect'. Update comment
[pf3gnuchains/gcc-fork.git] / Makefile.in
index 0384b73..efb2d20 100644 (file)
@@ -3,7 +3,7 @@
 #
 # 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
@@ -46,6 +46,9 @@ enable_version_specific_runtime_libs = @enable_version_specific_runtime_libs@
 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@
+
 srcdir = @srcdir@
 
 prefix = @prefix@
@@ -104,6 +107,7 @@ INSTALL_DATA = $(INSTALL) -m 644
 AS = @AS@
 AR = @AR@
 AR_FLAGS = rc
+RANLIB = @RANLIB@
 CC = @CC@
 
 # Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
@@ -385,6 +389,7 @@ BASE_FLAGS_TO_PASS = \
        "CXXFLAGS=$(CXXFLAGS)" \
        "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
        "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
+       "DESTDIR=$(DESTDIR)" \
        "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
        "INSTALL=$(INSTALL)" \
        "INSTALL_DATA=$(INSTALL_DATA)" \
@@ -539,7 +544,6 @@ CLEAN_MODULES = \
        clean-bison \
        clean-byacc \
        clean-bzip2 \
-       clean-db \
        clean-dejagnu \
        clean-diff \
        clean-dosutils \
@@ -554,7 +558,6 @@ CLEAN_MODULES = \
        clean-gettext \
        clean-gnuserv \
        clean-gprof \
-       clean-grep \
        clean-gzip \
        clean-hello \
        clean-indent \
@@ -580,7 +583,6 @@ CLEAN_MODULES = \
        clean-shellutils \
        clean-sid \
        clean-sim \
-       clean-snavigator \
        clean-tar \
        clean-texinfo \
        clean-textutils \
@@ -1076,7 +1078,7 @@ do-info: maybe-all-texinfo
 install-info: do-install-info dir.info
        s=`cd $(srcdir); ${PWD}`; export s; \
        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:
@@ -1207,7 +1209,7 @@ installdirs: mkinstalldirs
 
 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
@@ -1980,73 +1982,6 @@ install-bzip2: installdirs
          (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
-.PHONY: configure-db maybe-configure-db
-maybe-configure-db:
-configure-db:
-       @test ! -f db/Makefile || exit 0; \
-       [ -d db ] || mkdir db; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       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; \
-       echo Configuring in db; \
-       cd db || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/db"; \
-           libsrcdir="$$s/db";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/db"; \
-           libsrcdir="$$s/db";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         || exit 1
-
-.PHONY: all-db maybe-all-db
-maybe-all-db:
-all-db: configure-db
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd db && $(MAKE) $(FLAGS_TO_PASS) all)
-
-
-.PHONY: check-db
-check-db:
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd db && $(MAKE) $(FLAGS_TO_PASS) check)
-
-
-
-.PHONY: install-db maybe-install-db
-maybe-install-db:
-install-db: installdirs
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd db && $(MAKE) $(FLAGS_TO_PASS) install)
-
-
 .PHONY: configure-dejagnu maybe-configure-dejagnu
 maybe-configure-dejagnu:
 configure-dejagnu:
@@ -2987,73 +2922,6 @@ install-gprof: installdirs
          (cd gprof && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
-.PHONY: configure-grep maybe-configure-grep
-maybe-configure-grep:
-configure-grep:
-       @test ! -f grep/Makefile || exit 0; \
-       [ -d grep ] || mkdir grep; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       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; \
-       echo Configuring in grep; \
-       cd grep || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/grep"; \
-           libsrcdir="$$s/grep";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/grep"; \
-           libsrcdir="$$s/grep";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         || exit 1
-
-.PHONY: all-grep maybe-all-grep
-maybe-all-grep:
-all-grep: configure-grep
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd grep && $(MAKE) $(FLAGS_TO_PASS) all)
-
-
-.PHONY: check-grep
-check-grep:
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd grep && $(MAKE) $(FLAGS_TO_PASS) check)
-
-
-
-.PHONY: install-grep maybe-install-grep
-maybe-install-grep:
-install-grep: installdirs
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd grep && $(MAKE) $(FLAGS_TO_PASS) install)
-
-
 .PHONY: configure-gzip maybe-configure-gzip
 maybe-configure-gzip:
 configure-gzip:
@@ -4717,73 +4585,6 @@ install-sim: installdirs
          (cd sim && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
-.PHONY: configure-snavigator maybe-configure-snavigator
-maybe-configure-snavigator:
-configure-snavigator:
-       @test ! -f snavigator/Makefile || exit 0; \
-       [ -d snavigator ] || mkdir snavigator; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       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; \
-       echo Configuring in snavigator; \
-       cd snavigator || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/snavigator"; \
-           libsrcdir="$$s/snavigator";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/snavigator"; \
-           libsrcdir="$$s/snavigator";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         || exit 1
-
-.PHONY: all-snavigator maybe-all-snavigator
-maybe-all-snavigator:
-all-snavigator: configure-snavigator
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd snavigator && $(MAKE) $(FLAGS_TO_PASS) all)
-
-
-.PHONY: check-snavigator
-check-snavigator:
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd snavigator && $(MAKE) $(FLAGS_TO_PASS) check)
-
-
-
-.PHONY: install-snavigator maybe-install-snavigator
-maybe-install-snavigator:
-install-snavigator: installdirs
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd snavigator && $(MAKE) $(FLAGS_TO_PASS) install)
-
-
 .PHONY: configure-tar maybe-configure-tar
 maybe-configure-tar:
 configure-tar:
@@ -5798,6 +5599,7 @@ configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
            CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -5898,6 +5700,7 @@ configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -5997,6 +5800,7 @@ configure-target-libf2c: $(TARGET_SUBDIR)/libf2c/multilib.out
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6096,6 +5900,7 @@ configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6195,6 +6000,7 @@ configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6290,6 +6096,7 @@ configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6389,6 +6196,7 @@ configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6484,6 +6292,7 @@ configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6583,6 +6392,7 @@ configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6682,6 +6492,7 @@ configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6773,6 +6584,7 @@ configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6843,8 +6655,12 @@ check-target-libffi:
 
 .PHONY: install-target-libffi maybe-install-target-libffi
 maybe-install-target-libffi:
-# Dummy target for uninstallable.
-install-target-libffi:
+install-target-libffi: installdirs
+       @r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
+         $(SET_LIB_PATH) \
+         (cd $(TARGET_SUBDIR)/libffi && \
+           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-target-libjava maybe-configure-target-libjava
@@ -6868,6 +6684,7 @@ configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
            CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -6968,6 +6785,7 @@ configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -7067,6 +6885,7 @@ configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -7166,6 +6985,7 @@ configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -7265,6 +7085,7 @@ configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -7364,6 +7185,7 @@ configure-gcc:
        CFLAGS="$(CFLAGS)"; export CFLAGS; \
        CXX="$(CXX)"; export CXX; \
        CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
+       TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
        if [ z$(build_canonical) !=  z$(host_canoncial) ] ; then \
          AR="$(AR)"; export AR; \
          AS="$(AS)"; export AS; \
@@ -7487,7 +7309,8 @@ check-gcc-c++:
        fi
 
 .PHONY: check-c++
-check-c++: check-target-libstdc++-v3 check-gcc-c++
+check-c++:
+       $(MAKE) check-target-libstdc++-v3 check-gcc-c++ NOTPARALLEL=parallel-ok
 
 .PHONY: install-gcc maybe-install-gcc
 maybe-install-gcc:
@@ -7573,7 +7396,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
-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
@@ -7590,7 +7413,6 @@ 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-grep: maybe-all-libiberty
 all-gzip: maybe-all-libiberty
 all-hello: maybe-all-libiberty
 all-m4: maybe-all-libiberty maybe-all-texinfo
@@ -7600,7 +7422,6 @@ 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
 
@@ -7665,7 +7486,7 @@ multilib.out: maybe-all-gcc
 
 # Rebuilding Makefile.in, using autogen.
 AUTOGEN = autogen
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
+$(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
        cd $(srcdir) && $(AUTOGEN) Makefile.def
 
 # Rebuilding Makefile.
@@ -7677,7 +7498,7 @@ config.status: configure $(gcc_version_trigger)
 
 # Rebuilding configure.
 AUTOCONF = autoconf
-$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/config/acx.m4
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
        cd $(srcdir) && $(AUTOCONF)
 #