From: Julian Seward <jseward@acm.org>
Date: Sun, 20 Oct 2002 19:50:07 +0000 (+0000)
Subject: merge patch from Jeremy Fitzhardinge:
X-Git-Tag: svn/VALGRIND_1_9_4~198
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1069339a64f2dd7aa18e6c915386bf2486df1022;p=thirdparty%2Fvalgrind.git

merge patch from Jeremy Fitzhardinge:

16-ld-nodelete
  Add -Wl,-z,nodelete,-z,initfirst to link line for libpthread.so,
  because HJ [Lu] says so. Also add soname.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1249
---

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 1a15b6f255..225033f0de 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -25,7 +25,10 @@ libpthread_so_SOURCES = \
 	vg_libpthread.c \
 	vg_libpthread_unimp.c
 libpthread_so_DEPENDENCIES = $(srcdir)/vg_libpthread.vs
-libpthread_so_LDFLAGS	   = -Werror -fno-omit-frame-pointer -UVG_LIBDIR -shared -fpic -Wl,-version-script $(srcdir)/vg_libpthread.vs
+libpthread_so_LDFLAGS	   = -Werror -fno-omit-frame-pointer -UVG_LIBDIR -shared -fpic \
+	-Wl,-version-script $(srcdir)/vg_libpthread.vs \
+	-Wl,-z,nodelete,-z,initfirst \
+	-Wl,--soname=libpthread.so.0
 
 valgrinq_so_SOURCES = vg_valgrinq_dummy.c
 valgrinq_so_LDFLAGS = -shared
@@ -58,7 +61,7 @@ valgrind_so_SOURCES = \
 	vg_translate.c \
 	vg_transtab.c \
 	vg_ldt.c
-valgrind_so_LDFLAGS = -Wl,-z -Wl,initfirst -shared
+valgrind_so_LDFLAGS = -Wl,-z,initfirst -shared
 valgrind_so_LDADD = \
 	demangle/cp-demangle.o \
 	demangle/cplus-dem.o \