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 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 1a15b6f..225033f 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -25,7 +25,10 @@
 	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 @@
 	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 \