merge rev 1.90.2.12:

Put __pthread_getspecific_addr inside ifdefs.

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

diff --git a/coregrind/arch/x86-linux/vg_libpthread.c b/coregrind/arch/x86-linux/vg_libpthread.c
index 363e6ffd2cfabf1594cdd1ce0cd2d0f6bb3fc2a0..42e289f3635f0c61325c9b8c178015baf23ccffd 100644 (file)
--- a/coregrind/arch/x86-linux/vg_libpthread.c
+++ b/coregrind/arch/x86-linux/vg_libpthread.c
@@ -1419,6 +1419,7 @@ void * __pthread_getspecific(pthread_key_t key)
 }
 
 
+#ifdef GLIBC_2_3
 static
 void ** __pthread_getspecific_addr(pthread_key_t key)
 {
@@ -1431,7 +1432,7 @@ void ** __pthread_getspecific_addr(pthread_key_t key)
    specifics_ptr = get_or_allocate_specifics_ptr(pthread_self());
    return &(specifics_ptr[key]);
 }
-
+#endif
 
 /* ---------------------------------------------------
    ONCEry

diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c
index 363e6ffd2cfabf1594cdd1ce0cd2d0f6bb3fc2a0..42e289f3635f0c61325c9b8c178015baf23ccffd 100644 (file)
--- a/coregrind/vg_libpthread.c
+++ b/coregrind/vg_libpthread.c
@@ -1419,6 +1419,7 @@ void * __pthread_getspecific(pthread_key_t key)
 }
 
 
+#ifdef GLIBC_2_3
 static
 void ** __pthread_getspecific_addr(pthread_key_t key)
 {
@@ -1431,7 +1432,7 @@ void ** __pthread_getspecific_addr(pthread_key_t key)
    specifics_ptr = get_or_allocate_specifics_ptr(pthread_self());
    return &(specifics_ptr[key]);
 }
-
+#endif
 
 /* ---------------------------------------------------
    ONCEry