From: Jeff Johnston <jjohnstn@redhat.com>
Date: Fri, 3 Dec 2004 21:20:15 +0000 (+0000)
Subject: 2004-12-03  Shaun Jackman  <sjackman@gmail.com>
X-Git-Tag: binutils-2_16-branchpoint~322
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=c80a17311c6969658af5260d74d8269a25f84ea5;p=newlib-cygwin.git

2004-12-03  Shaun Jackman  <sjackman@gmail.com>

        * libc/sys/linux/linuxthreads/Makefile.am (install-data-local): Fix
        our link to use readlink so as to preserve any relative link created
        by install-toollibLIBRARIES.
        * libc/sys/linux/linuxthreads/Makefile.in: Regenerated.
---

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 260488d51..f38a7954d 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-03  Shaun Jackman  <sjackman@gmail.com>
+
+	* libc/sys/linux/linuxthreads/Makefile.am (install-data-local): Fix
+	our link to use readlink so as to preserve any relative link created
+	by install-toollibLIBRARIES.
+	* libc/sys/linux/linuxthreads/Makefile.in: Regenerated.
+
 2004-12-02  Shaun Jackman  <sjackman@gmail.com>
 
 	* libc/sys/linux/stdlib/glob.c: Include <sys/types.h> which defines
diff --git a/newlib/libc/sys/linux/linuxthreads/Makefile.am b/newlib/libc/sys/linux/linuxthreads/Makefile.am
index a47cecc17..0122d668b 100644
--- a/newlib/libc/sys/linux/linuxthreads/Makefile.am
+++ b/newlib/libc/sys/linux/linuxthreads/Makefile.am
@@ -53,8 +53,8 @@ SUBDIRS = machine .
 tooldir = $(tooldir)
 toollibdir = $(top_toollibdir)
 
-libpthread_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/../shared.ld `cat extra-libtool-objlist`
-libthread_db_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/../shared.ld 
+libpthread_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -lgcc -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/../shared.ld `cat extra-libtool-objlist`
+libthread_db_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -lgcc -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/../shared.ld 
 
 if USE_LIBTOOL
 
@@ -91,7 +91,10 @@ doc:
 
 install-data-local: install-toollibLIBRARIES
 	-rm -f $(DESTDIR)$(toollibdir)/libthread_db.so.1
-	ln -s $(DESTDIR)$(toollibdir)/libthread_db.so $(DESTDIR)$(toollibdir)/libthread_db.so.1 || cp $(DESTDIR)$(toollibdir)/libthread_db.so $(DESTDIR)$(toollibdir)/libthread_db.so.1 
+	ln -s `readlink $(DESTDIR)$(toollibdir)/libthread_db.so` \
+	  $(DESTDIR)$(toollibdir)/libthread_db.so.1 \
+	  || cp $(DESTDIR)$(toollibdir)/libthread_db.so \
+	  $(DESTDIR)$(toollibdir)/libthread_db.so.1 
 
 AM_CFLAGS = -D_XOPEN_SOURCE=600 -D_GNU_SOURCE=1
 ACLOCAL_AMFLAGS = -I ../../../..
diff --git a/newlib/libc/sys/linux/linuxthreads/Makefile.in b/newlib/libc/sys/linux/linuxthreads/Makefile.in
index 232c001f4..d957b0545 100644
--- a/newlib/libc/sys/linux/linuxthreads/Makefile.in
+++ b/newlib/libc/sys/linux/linuxthreads/Makefile.in
@@ -123,8 +123,8 @@ SUBDIRS = machine .
 tooldir = $(tooldir)
 toollibdir = $(top_toollibdir)
 
-libpthread_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/../shared.ld `cat extra-libtool-objlist`
-libthread_db_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/../shared.ld 
+libpthread_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -lgcc -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/../shared.ld `cat extra-libtool-objlist`
+libthread_db_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -lgcc -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/../shared.ld 
 
 @USE_LIBTOOL_TRUE@toollib_LTLIBRARIES = libpthread.la libthread_db.la
 @USE_LIBTOOL_TRUE@libpthread_la_SOURCES = $(LIB_SOURCES)
@@ -642,7 +642,10 @@ doc:
 
 install-data-local: install-toollibLIBRARIES
 	-rm -f $(DESTDIR)$(toollibdir)/libthread_db.so.1
-	ln -s $(DESTDIR)$(toollibdir)/libthread_db.so $(DESTDIR)$(toollibdir)/libthread_db.so.1 || cp $(DESTDIR)$(toollibdir)/libthread_db.so $(DESTDIR)$(toollibdir)/libthread_db.so.1 
+	ln -s `readlink $(DESTDIR)$(toollibdir)/libthread_db.so` \
+	  $(DESTDIR)$(toollibdir)/libthread_db.so.1 \
+	  || cp $(DESTDIR)$(toollibdir)/libthread_db.so \
+	  $(DESTDIR)$(toollibdir)/libthread_db.so.1 
 
 pt-initfini.s: $(srcdir)/pt-initfini.c
 	$(CC) -S $(CFLAGS_pt_initfini) -finhibit-size-directive \