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:17:38 +0200 |
| commit | deb317d5109aecd54573cc0340d23d641d80d45e (patch) | |
| tree | b8fdcb9f2dd6f016eccf0768e50acee18eed8d5f /sysdeps/pthread | |
| parent | e4036b1ce9fa2f4086b050eb946f169c11efad08 (diff) | |
| download | glibc-deb317d5109aecd54573cc0340d23d641d80d45e.tar.gz glibc-deb317d5109aecd54573cc0340d23d641d80d45e.tar.xz glibc-deb317d5109aecd54573cc0340d23d641d80d45e.zip | |
nptl: Move tss_delete into libc
The symbol was moved using scripts/move-symbol-to-libc.py. __pthread_key_delete@@GLIBC_PRIVATE is no longer needed after that, so it is removed as well. 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 | 3 | ||||
| -rw-r--r-- | sysdeps/pthread/tss_delete.c | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 4b7e43078c..fd06d0a448 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_delete tss_get tss_set + tss_get tss_set $(libpthread-routines-var) += \ call_once \ @@ -50,6 +50,7 @@ $(libpthread-routines-var) += \ mtx_unlock \ thrd_exit \ tss_create \ + tss_delete \ 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_delete.c b/sysdeps/pthread/tss_delete.c index 67167454fd..b80310811e 100644 --- a/sysdeps/pthread/tss_delete.c +++ b/sysdeps/pthread/tss_delete.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_delete (tss_t tss_id) +__tss_delete (tss_t tss_id) { __pthread_key_delete (tss_id); } +#if PTHREAD_IN_LIBC +versioned_symbol (libc, __tss_delete, tss_delete, GLIBC_2_34); +# if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_28, GLIBC_2_34) +compat_symbol (libpthread, __tss_delete, tss_delete, GLIBC_2_28); +# endif +#else /* !PTHREAD_IN_LIBC */ +strong_alias (__tss_delete, tss_delete) +#endif |