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>

65 files changed, 81 insertions, 36 deletions

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,
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
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 22c83416d9..71f7cdbc6b 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -2220,6 +2220,7 @@ GLIBC_2.28 thrd_exit F
 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.29 getcpu F
 GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
 GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
@@ -2311,3 +2312,4 @@ GLIBC_2.34 pthread_spin_trylock F
 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
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index 22d805d968..de3b4fb61b 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_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 69246ca59d..6349910312 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -2113,6 +2113,7 @@ GLIBC_2.28 thrd_exit F
 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.29 getcpu F
 GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
 GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
@@ -2392,6 +2393,7 @@ GLIBC_2.34 pthread_spin_trylock F
 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.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 32f24fc73f..c9e8450c69 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_det