Add a version script so as to create the right versioned symbols for

libpthread.so.

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

diff --git a/Makefile.am b/Makefile.am
index e6e58a8dcded617abc97a6b9e6ea36d15571c1d9..2b6d3e1bd7f9cdbba7845b0fcaa9d741a9b788a0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,7 +95,8 @@ valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
 
 libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS)
        $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
-               $(libpthread_so_OBJECTS)
+               $(libpthread_so_OBJECTS) \
+               -Wl,-version-script vg_libpthread.vs
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)

diff --git a/addrcheck/Makefile.am b/addrcheck/Makefile.am
index e6e58a8dcded617abc97a6b9e6ea36d15571c1d9..2b6d3e1bd7f9cdbba7845b0fcaa9d741a9b788a0 100644 (file)
--- a/addrcheck/Makefile.am
+++ b/addrcheck/Makefile.am
@@ -95,7 +95,8 @@ valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
 
 libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS)
        $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
-               $(libpthread_so_OBJECTS)
+               $(libpthread_so_OBJECTS) \
+               -Wl,-version-script vg_libpthread.vs
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)

diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
index e6e58a8dcded617abc97a6b9e6ea36d15571c1d9..2b6d3e1bd7f9cdbba7845b0fcaa9d741a9b788a0 100644 (file)
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -95,7 +95,8 @@ valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
 
 libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS)
        $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
-               $(libpthread_so_OBJECTS)
+               $(libpthread_so_OBJECTS) \
+               -Wl,-version-script vg_libpthread.vs
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)

diff --git a/corecheck/Makefile.am b/corecheck/Makefile.am
index e6e58a8dcded617abc97a6b9e6ea36d15571c1d9..2b6d3e1bd7f9cdbba7845b0fcaa9d741a9b788a0 100644 (file)
--- a/corecheck/Makefile.am
+++ b/corecheck/Makefile.am
@@ -95,7 +95,8 @@ valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
 
 libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS)
        $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
-               $(libpthread_so_OBJECTS)
+               $(libpthread_so_OBJECTS) \
+               -Wl,-version-script vg_libpthread.vs
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index e6e58a8dcded617abc97a6b9e6ea36d15571c1d9..2b6d3e1bd7f9cdbba7845b0fcaa9d741a9b788a0 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -95,7 +95,8 @@ valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
 
 libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS)
        $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
-               $(libpthread_so_OBJECTS)
+               $(libpthread_so_OBJECTS) \
+               -Wl,-version-script vg_libpthread.vs
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)

diff --git a/coregrind/vg_libpthread.vs b/coregrind/vg_libpthread.vs
new file mode 100644 (file)
index 0000000..05f133b
--- /dev/null
+++ b/coregrind/vg_libpthread.vs
@@ -0,0 +1,6 @@
+
+GLIBC_2.0 {
+};
+
+GLIBC_2.1 {
+} GLIBC_2.0;

diff --git a/helgrind/Makefile.am b/helgrind/Makefile.am
index e6e58a8dcded617abc97a6b9e6ea36d15571c1d9..2b6d3e1bd7f9cdbba7845b0fcaa9d741a9b788a0 100644 (file)
--- a/helgrind/Makefile.am
+++ b/helgrind/Makefile.am
@@ -95,7 +95,8 @@ valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
 
 libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS)
        $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
-               $(libpthread_so_OBJECTS)
+               $(libpthread_so_OBJECTS) \
+               -Wl,-version-script vg_libpthread.vs
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)

diff --git a/lackey/Makefile.am b/lackey/Makefile.am
index e6e58a8dcded617abc97a6b9e6ea36d15571c1d9..2b6d3e1bd7f9cdbba7845b0fcaa9d741a9b788a0 100644 (file)
--- a/lackey/Makefile.am
+++ b/lackey/Makefile.am
@@ -95,7 +95,8 @@ valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
 
 libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS)
        $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
-               $(libpthread_so_OBJECTS)
+               $(libpthread_so_OBJECTS) \
+               -Wl,-version-script vg_libpthread.vs
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)

diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am
index e6e58a8dcded617abc97a6b9e6ea36d15571c1d9..2b6d3e1bd7f9cdbba7845b0fcaa9d741a9b788a0 100644 (file)
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -95,7 +95,8 @@ valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
 
 libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS)
        $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
-               $(libpthread_so_OBJECTS)
+               $(libpthread_so_OBJECTS) \
+               -Wl,-version-script vg_libpthread.vs
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)

diff --git a/none/Makefile.am b/none/Makefile.am
index e6e58a8dcded617abc97a6b9e6ea36d15571c1d9..2b6d3e1bd7f9cdbba7845b0fcaa9d741a9b788a0 100644 (file)
--- a/none/Makefile.am
+++ b/none/Makefile.am
@@ -95,7 +95,8 @@ valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
 
 libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS)
        $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
-               $(libpthread_so_OBJECTS)
+               $(libpthread_so_OBJECTS) \
+               -Wl,-version-script vg_libpthread.vs
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)

diff --git a/vg_libpthread.vs b/vg_libpthread.vs
new file mode 100644 (file)
index 0000000..05f133b
--- /dev/null
+++ b/vg_libpthread.vs
@@ -0,0 +1,6 @@
+
+GLIBC_2.0 {
+};
+
+GLIBC_2.1 {
+} GLIBC_2.0;