This commit was manufactured by cvs2svn to create tag 'drow_intercu-drow_intercu-merge-20040915

merge-20040915'.

Sprout from gdb_6_3-branch 2004-10-12 23:40:04 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'gdb_6_3-branch'.'
Cherrypick from master 2004-09-14 01:16:22 UTC DJ Delorie <dj@redhat.com> 'merge from gcc':
    ChangeLog
    Makefile.in
    Makefile.tpl
    config.guess
    config/ChangeLog
    config/gettext.m4
    configure
    configure.in
    include/ChangeLog
    include/bfdlink.h
    include/elf/ChangeLog
    include/elf/arm.h
    include/elf/common.h
    include/elf/dwarf2.h
    include/elf/x86-64.h
    include/elf/xtensa.h
    include/opcode/ChangeLog
    include/opcode/arm.h
    include/opcode/crx.h
    include/xtensa-config.h
    include/xtensa-isa-internal.h
    include/xtensa-isa.h
    install-sh
    ltcf-c.sh
    ltcf-cxx.sh
    ltconfig
Cherrypick from cygnus 1999-05-03 07:29:06 UTC Richard Henderson <rth@redhat.com> '19990502 sourceware import':
    ylwrap
Delete:
    config/codeset.m4
    config/gcc-lib-path.m4
    config/gettext-sister.m4
    config/glibc21.m4
    config/iconv.m4
    config/intdiv0.m4
    config/inttypes-pri.m4
    config/inttypes.m4
    config/inttypes_h.m4
    config/lcmessage.m4
    config/lib-ld.m4
    config/lib-link.m4
    config/lib-prefix.m4
    config/mh-x86omitfp
    config/nls.m4
    config/po.m4
    config/stdint_h.m4
    config/uintmax_t.m4
    config/ulonglong.m4
    config/warnings.m4

1 files changed, 9 insertions, 10 deletions

diff --git a/Makefile.tpl b/Makefile.tpl
index 3fb09f7d8..d685c39de 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -104,7 +104,6 @@ SET_LIB_PATH = @SET_LIB_PATH@
 # Some platforms don't like blank entries, so we remove duplicate,
 # leading and trailing colons.
 REALLY_SET_LIB_PATH = \
-  @SET_GCC_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.
@@ -174,9 +173,7 @@ HOST_EXPORTS = \
 	OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
 	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
 	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
-	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
-	SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \
-	@SET_GCC_LIB_PATH@
+	GMPINC="$(HOST_GMPINC)"; export GMPINC;
 
 # Similar, for later GCC stages.
 STAGE_HOST_EXPORTS = \
@@ -210,9 +207,7 @@ BASE_TARGET_EXPORTS = \
 	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
 	NM="$(NM_FOR_TARGET)"; export NM; \
 	RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-	SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \
-	@SET_GCC_LIB_PATH@
+	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES;
 
 RAW_CXX_TARGET_EXPORTS = \
 	$(BASE_TARGET_EXPORTS) \
@@ -909,7 +904,6 @@ configure-[+module+]:
 .PHONY: all-[+module+] maybe-all-[+module+]
 maybe-all-[+module+]:
 @if [+module+]
-TARGET-[+module+]=[+ IF target +][+target+][+ ELSE +]all[+ ENDIF target +]
 maybe-all-[+module+]: all-[+module+]
 all-[+module+]: configure-[+module+]
 	@[+ IF bootstrap +]test -f stage_last && exit 0; \
@@ -917,8 +911,13 @@ all-[+module+]: configure-[+module+]
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(SET_LIB_PATH) \
 	$(HOST_EXPORTS) \
-	(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] \
-	  $(TARGET-[+module+]))
+	(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ 
+	  IF with_x 
+	    +] $(X11_FLAGS_TO_PASS)[+ 
+	  ENDIF with_x +] [+extra_make_flags+] [+
+	  IF (== (get "module") "gcc") +] \
+	    `if [ -f gcc/stage_last ]; then echo quickstrap ; else echo all; fi` [+
+	  ELSE +]all[+ ENDIF +])
 @endif [+module+]
 
 .PHONY: check-[+module+] maybe-check-[+module+]