about summary refs log tree commit diff
path: root/sysdeps/pthread
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-05-03 08:12:12 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-05-03 08:18:01 +0200
commita062ba38362f370aefac400e34ece13d09083752 (patch)
tree8ca67deeaecba5e56ef67641f93283963168b777 /sysdeps/pthread
parentdeb317d5109aecd54573cc0340d23d641d80d45e (diff)
downloadglibc-a062ba38362f370aefac400e34ece13d09083752.tar.gz
glibc-a062ba38362f370aefac400e34ece13d09083752.tar.xz
glibc-a062ba38362f370aefac400e34ece13d09083752.zip
nptl: Move tss_get into libc
The symbol was moved using scripts/move-symbol-to-libc.py.

__pthread_getspecific@@GLIBC_2.34 is no longer needed after the move,
so it is removed with this commit, too.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/pthread')
-rw-r--r--sysdeps/pthread/Makefile3
-rw-r--r--sysdeps/pthread/tss_get.c11
2 files changed, 12 insertions, 2 deletions
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index fd06d0a448..493087732d 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -32,7 +32,7 @@ headers += threads.h
 routines += thrd_current thrd_equal thrd_sleep thrd_yield
 
 libpthread-routines += thrd_create thrd_detach thrd_join \
-		       tss_get tss_set
+		       tss_set
 
 $(libpthread-routines-var) += \
   call_once \
@@ -51,6 +51,7 @@ $(libpthread-routines-var) += \
   thrd_exit \
   tss_create \
   tss_delete \
+  tss_get \
 
 tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
 	 tst-cnd-timedwait tst-thrd-detach tst-mtx-basic tst-thrd-sleep \
diff --git a/sysdeps/pthread/tss_get.c b/sysdeps/pthread/tss_get.c
index a4b6f82b5e..f74af18017 100644
--- a/sysdeps/pthread/tss_get.c
+++ b/sysdeps/pthread/tss_get.c
@@ -16,10 +16,19 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
+#include <shlib-compat.h>
 #include "thrd_priv.h"
 
 void *
-tss_get (tss_t tss_id)
+__tss_get (tss_t tss_id)
 {
   return __pthread_getspecific (tss_id);
 }
+#if PTHREAD_IN_LIBC
+versioned_symbol (libc, __tss_get, tss_get, GLIBC_2_34);
+# if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_28, GLIBC_2_34)
+compat_symbol (libpthread, __tss_get, tss_get, GLIBC_2_28);
+# endif
+#else /* !PTHREAD_IN_LIBC */
+strong_alias (__tss_get, tss_get)
+#endif