aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2001-10-21 00:08:22 +0000
committerDJ Delorie <dj@redhat.com>2001-10-21 00:08:22 +0000
commit3bc62f91f49adee45295debabc8b19e10986619f (patch)
treec285f1e026c7b78e1e178e8562b4f687ae2a1ea4
parentf33a8213522e6affd212525cab5f4ff19be3a1c9 (diff)
downloadgdb-3bc62f91f49adee45295debabc8b19e10986619f.zip
gdb-3bc62f91f49adee45295debabc8b19e10986619f.tar.gz
gdb-3bc62f91f49adee45295debabc8b19e10986619f.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/Makefile.in9
2 files changed, 13 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 52eb093..29777fe 100644
--- 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
--- 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