diff options
65 files changed, 82 insertions, 68 deletions
diff --git a/nptl/Versions b/nptl/Versions index fa7882a22c..487e251445 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -146,6 +146,7 @@ libc { thrd_yield; tss_create; tss_delete; + tss_get; } GLIBC_2.30 { pthread_cond_clockwait; @@ -161,7 +162,6 @@ libc { } GLIBC_2.34 { __pthread_cleanup_routine; - __pthread_getspecific; __pthread_key_create; __pthread_mutex_lock; __pthread_mutex_unlock; @@ -216,6 +216,7 @@ libc { thrd_exit; tss_create; tss_delete; + tss_get; } GLIBC_PRIVATE { __futex_abstimed_wait64; @@ -394,7 +395,6 @@ libpthread { thrd_create; thrd_detach; thrd_join; - tss_get; tss_set; } diff --git a/nptl/pthread_getspecific.c b/nptl/pthread_getspecific.c index 230497a84d..3aad6713e4 100644 --- a/nptl/pthread_getspecific.c +++ b/nptl/pthread_getspecific.c @@ -63,12 +63,13 @@ ___pthread_getspecific (pthread_key_t key) return result; } -versioned_symbol (libc, ___pthread_getspecific, __pthread_getspecific, +versioned_symbol (libc, ___pthread_getspecific, pthread_getspecific, GLIBC_2_34); libc_hidden_ver (___pthread_getspecific, __pthread_getspecific) +#ifndef SHARED +strong_alias (___pthread_getspecific, __pthread_getspecific) +#endif -versioned_symbol (libc, ___pthread_getspecific, pthread_getspecific, - GLIBC_2_34); #if OTHER_SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_34) compat_symbol (libpthread, ___pthread_getspecific, __pthread_getspecific, GLIBC_2_0); 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 diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index 71f7cdbc6b..62ee51335d 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -2221,6 +2221,7 @@ GLIBC_2.28 thrd_sleep F GLIBC_2.28 thrd_yield F GLIBC_2.28 tss_create F GLIBC_2.28 tss_delete F +GLIBC_2.28 tss_get F GLIBC_2.29 getcpu F GLIBC_2.29 posix_spawn_file_actions_addchdir_np F GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F @@ -2254,7 +2255,6 @@ GLIBC_2.33 stat F GLIBC_2.33 stat64 F GLIBC_2.34 __libc_start_main F GLIBC_2.34 __pthread_cleanup_routine F -GLIBC_2.34 __pthread_getspecific F GLIBC_2.34 __pthread_key_create F GLIBC_2.34 __pthread_mutex_lock F GLIBC_2.34 __pthread_mutex_unlock F @@ -2313,3 +2313,4 @@ GLIBC_2.34 pthread_spin_unlock F GLIBC_2.34 thrd_exit F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F +GLIBC_2.34 tss_get F diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index de3b4fb61b..3408697ac1 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -72,7 +72,6 @@ GLIBC_2.18 pthread_setattr_default_np F GLIBC_2.28 thrd_create F GLIBC_2.28 thrd_detach F GLIBC_2.28 thrd_join F -GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index 6349910312..16bf215d70 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -2114,6 +2114,7 @@ GLIBC_2.28 thrd_sleep F GLIBC_2.28 thrd_yield F GLIBC_2.28 tss_create F GLIBC_2.28 tss_delete F +GLIBC_2.28 tss_get F GLIBC_2.29 getcpu F GLIBC_2.29 posix_spawn_file_actions_addchdir_np F GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F @@ -2335,7 +2336,6 @@ GLIBC_2.33 stat F GLIBC_2.33 stat64 F GLIBC_2.34 __libc_start_main F GLIBC_2.34 __pthread_cleanup_routine F -GLIBC_2.34 __pthread_getspecific F GLIBC_2.34 __pthread_key_create F GLIBC_2.34 __pthread_mutex_lock F GLIBC_2.34 __pthread_mutex_unlock F @@ -2394,6 +2394,7 @@ GLIBC_2.34 pthread_spin_unlock F GLIBC_2.34 thrd_exit F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F +GLIBC_2.34 tss_get F GLIBC_2.4 _IO_fprintf F GLIBC_2.4 _IO_printf F GLIBC_2.4 _IO_sprintf F diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist index c9e8450c69..f6871dd45e 100644 --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist @@ -72,7 +72,6 @@ GLIBC_2.2.6 __libpthread_version_placeholder F GLIBC_2.28 thrd_create F GLIBC_2.28 thrd_detach F GLIBC_2.28 thrd_join F -GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F GLIBC_2.3.2 __libpthread_version_placeholder F GLIBC_2.3.3 __pthread_register_cancel F diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist index 9522a2169e..0255fcc1e1 100644 --- a/sysdeps/unix/sysv/linux/arc/libc.abilist +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist |