merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 52eb093..29777fe 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-19  H.J. Lu <hjl@gnu.org>
+
+       * Makefile.in ($(TARGETLIB)): Also generate pic/$(TARGETLIB) if
+       necessary.
+
 2001-10-17  DJ Delorie  <dj@redhat.com>
 
        * argv.c, asprintf.c, choose-temp.c, concat.c, cplus-dem.c,

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index f549902..877e0a9 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -154,10 +154,17 @@ CONFIGURED_OFILES = asprintf.o atexit.o basename.o bcmp.o bcopy.o \
        vsprintf.o waitpid.o
 
 $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
-       -rm -f $(TARGETLIB)
+       -rm -f $(TARGETLIB) pic/$(TARGETLIB)
        $(AR) $(AR_FLAGS) $(TARGETLIB) \
          $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
        $(RANLIB) $(TARGETLIB)
+       if [ x"$(PICFLAG)" != x ]; then \
+         cd pic; \
+         $(AR) $(AR_FLAGS) $(TARGETLIB) \
+           $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
+         $(RANLIB) $(TARGETLIB); \
+         cd ..; \
+       else true; fi
 
 info: libiberty.info info-subdir
 install-info: install-info-subdir