about summary refs log tree commit diff
path: root/sysdeps/pthread/tss_delete.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-05-03 08:12:12 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-05-03 08:17:38 +0200
commitdeb317d5109aecd54573cc0340d23d641d80d45e (patch)
treeb8fdcb9f2dd6f016eccf0768e50acee18eed8d5f /sysdeps/pthread/tss_delete.c
parente4036b1ce9fa2f4086b050eb946f169c11efad08 (diff)
downloadglibc-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/tss_delete.c')
-rw-r--r--sysdeps/pthread/tss_delete.c11
1 files changed, 10 insertions, 1 deletions
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