From deb317d5109aecd54573cc0340d23d641d80d45e Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 3 May 2021 08:12:12 +0200 Subject: 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 Tested-by: Carlos O'Donell --- nptl/Versions | 4 ++-- nptl/pthread_key_delete.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'nptl') diff --git a/nptl/Versions b/nptl/Versions index f267d4d1e7..fa7882a22c 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -145,6 +145,7 @@ libc { thrd_sleep; thrd_yield; tss_create; + tss_delete; } GLIBC_2.30 { pthread_cond_clockwait; @@ -214,6 +215,7 @@ libc { pthread_spin_unlock; thrd_exit; tss_create; + tss_delete; } GLIBC_PRIVATE { __futex_abstimed_wait64; @@ -245,7 +247,6 @@ libc { __pthread_current_priority; __pthread_force_elision; __pthread_getattr_default_np; - __pthread_key_delete; __pthread_keys; __pthread_mutex_unlock_usercnt; __pthread_setcancelstate; @@ -393,7 +394,6 @@ libpthread { thrd_create; thrd_detach; thrd_join; - tss_delete; tss_get; tss_set; } diff --git a/nptl/pthread_key_delete.c b/nptl/pthread_key_delete.c index 93eedb92b8..f5e0953814 100644 --- a/nptl/pthread_key_delete.c +++ b/nptl/pthread_key_delete.c @@ -42,9 +42,9 @@ ___pthread_key_delete (pthread_key_t key) versioned_symbol (libc, ___pthread_key_delete, pthread_key_delete, GLIBC_2_34); libc_hidden_ver (___pthread_key_delete, __pthread_key_delete) - -versioned_symbol (libc, ___pthread_key_delete, __pthread_key_delete, - GLIBC_PRIVATE); +#ifndef SHARED +strong_alias (___pthread_key_delete, __pthread_key_delete) +#endif #if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_34) compat_symbol (libpthread, ___pthread_key_delete, pthread_key_delete, -- cgit 1.4.1