diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-03 08:12:12 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-03 08:18:08 +0200 |
| commit | 2c5c5c87c981fd68e7f646db0d479311e820c2f7 (patch) | |
| tree | 30f1a159054b0844316bfc28f1415a9e804c8e9b /sysdeps/pthread | |
| parent | a062ba38362f370aefac400e34ece13d09083752 (diff) | |
| download | glibc-2c5c5c87c981fd68e7f646db0d479311e820c2f7.tar.gz glibc-2c5c5c87c981fd68e7f646db0d479311e820c2f7.tar.xz glibc-2c5c5c87c981fd68e7f646db0d479311e820c2f7.zip | |
nptl: Move tss_set into libc
The symbol was moved using scripts/move-symbol-to-libc.py. __pthread_setspecific@@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/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/pthread/tss_set.c | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 493087732d..54bb11bab9 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -31,8 +31,7 @@ headers += threads.h routines += thrd_current thrd_equal thrd_sleep thrd_yield -libpthread-routines += thrd_create thrd_detach thrd_join \ - tss_set +libpthread-routines += thrd_create thrd_detach thrd_join $(libpthread-routines-var) += \ call_once \ @@ -52,6 +51,7 @@ $(libpthread-routines-var) += \ tss_create \ tss_delete \ tss_get \ + tss_set \ 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_set.c b/sysdeps/pthread/tss_set.c index 66b662acbd..d021302b0c 100644 --- a/sysdeps/pthread/tss_set.c +++ b/sysdeps/pthread/tss_set.c @@ -16,11 +16,20 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ +#include <shlib-compat.h> #include "thrd_priv.h" int -tss_set (tss_t tss_id, void *val) +__tss_set (tss_t tss_id, void *val) { int err_code = __pthread_setspecific (tss_id, val); return thrd_err_map (err_code); } +#if PTHREAD_IN_LIBC +versioned_symbol (libc, __tss_set, tss_set, GLIBC_2_34); +# if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_28, GLIBC_2_34) +compat_symbol (libpthread, __tss_set, tss_set, GLIBC_2_28); +# endif +#else /* !PTHREAD_IN_LIBC */ +strong_alias (__tss_set, tss_set) +#endif |