Move __pthread_clock_gettime and __pthread_clock_settime back to

the GLIBC_2.2.3 section which is where they were in glibc before
they were moved to GLIBC_PRIVATE around the 2.2.5 time frame.

This makes older systems work correctly as librt will be looking
for the symbols with that version. In order to make newer systems
work we make GLIBC_PRIVATE a child of the most recent version in
the file (currently GLIBC_2.3.3) so that a librt which is looking
for the symbols with a version of GLIBC_PRIVATE will find them.

The real glibc pthread libraries have GLIBC_PRIVATE as a child of
the most recent version anyway, so this shouldn't cause any problems
and with this change librt seems to be OK both on old RedHat 7.1 systems
with glibc 2.2.3 and on Fedora Core 2 systems with glibc 2.3.3.

Hopefully this will fix FAQ 3.4 but I haven't removed that just yet.

CCMAIL: 86696-done@bugs.kde.org

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

diff --git a/coregrind/vg_libpthread.vs b/coregrind/vg_libpthread.vs
index 6248e4936c2bf9ea6f45b95db9aa2165d7174b1a..4196b9a924ee6dbfca5e1b3fbb7622f665186c68 100644 (file)
--- a/coregrind/vg_libpthread.vs
+++ b/coregrind/vg_libpthread.vs
@@ -155,6 +155,11 @@
   GLIBC_2.2.3 {
     # Extensions.
     pthread_getattr_np;
+    # These are in GLIBC_PRIVATE in the real library now but keep them 
+    # here for now for backwards compatibiltiy - they will still be
+    # visible to programs linked agianst newer libraries because of
+    # the inheritance into GLIB_PRIVATE in this library.
+    __pthread_clock_gettime; __pthread_clock_settime;
   } GLIBC_2.2;
 
   GLIBC_2.2.6 {
@@ -193,6 +198,5 @@
 
   GLIBC_PRIVATE {
     __pthread_initialize_minimal; __pthread_cleanup_upto;
-    __pthread_clock_gettime; __pthread_clock_settime;
     __pthread_unwind;
-  };
+  } GLIBC_2.3.3;