From a062ba38362f370aefac400e34ece13d09083752 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 3 May 2021 08:12:12 +0200 Subject: 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 Tested-by: Carlos O'Donell --- sysdeps/pthread/Makefile | 3 ++- sysdeps/pthread/tss_get.c | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'sysdeps/pthread') diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index fd06d0a..4930877 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 a4b6f82..f74af18 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 . */ +#include #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 -- cgit v1.1