From 3378216a502092b8b3259de6542056133efd3d39 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@casey.soma.redhat.com>
Date: Sat, 3 Jun 2000 01:39:51 +0000
Subject: [PATCH] Makefile.in (libgcc.a): Also depend on $(LIB2ADD).

        * Makefile.in (libgcc.a): Also depend on $(LIB2ADD).
        * mklibgcc.in (force): New target.
        Make LIB2ADD stuff depend on it.

From-SVN: r34370
---
 gcc/ChangeLog   | 6 ++++++
 gcc/Makefile.in | 2 +-
 gcc/mklibgcc.in | 6 ++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3b27cead806..72bbdd1046b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-02  Jason Merrill  <jason@casey.soma.redhat.com>
+
+	* Makefile.in (libgcc.a): Also depend on $(LIB2ADD).
+	* mklibgcc.in (force): New target.
+	Make LIB2ADD stuff depend on it.
+
 2000-06-02  Richard Henderson  <rth@cygnus.com>
 
 	* alias.c (lang_get_alias_set): Remove.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 78a685925e7..17958128485 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -972,7 +972,7 @@ libgcc.mk: config.status Makefile mklibgcc $(LIB2ADD) xgcc$(exeext)
 	  $(SHELL) mklibgcc > tmp-libgcc.mk
 	$(SHELL) $(srcdir)/move-if-change tmp-libgcc.mk libgcc.mk
 
-libgcc.a: libgcc.ready libgcc.mk $(FPBIT) $(DPBIT)
+libgcc.a: libgcc.ready libgcc.mk $(FPBIT) $(DPBIT) $(LIB2ADD)
 	$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
 	  HOST_PREFIX="$(HOST_PREFIX)" HOST_PREFIX_1="$(HOST_PREFIX_1)" \
 	  AR_FOR_TARGET="$(AR_FOR_TARGET)" \
diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in
index c00c4afe272..77907d0186b 100644
--- a/gcc/mklibgcc.in
+++ b/gcc/mklibgcc.in
@@ -29,6 +29,8 @@ echo 'srcdir = @srcdir@'
 echo 'VPATH = @srcdir@'
 echo 'EQ = ='
 echo
+echo 'force:'
+echo
 
 # Detect gcc as OLDCC.  This indicates a target for which LIB1FUNCS
 # is not needed.  This is not quite the same as libgcc1.null, even
@@ -237,7 +239,7 @@ for file in $LIB2ADD; do
     fprime=`cat $file`
     for f in $fprime; do
 
-      lastout=""
+      lastout="force"
       for ml in $MULTILIBS; do
         dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'`
         flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;
@@ -317,7 +319,7 @@ for ml in $MULTILIBS; do
 done
 
 for f in $EXTRA_MULTILIB_PARTS; do
-  lastout=""
+  lastout="force"
   for ml in $MULTILIBS; do
     dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'`
     flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;