about summary refs log tree commit diff
path: root/nptl/pthread_key_delete.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-04-21 19:49:51 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-04-21 19:49:51 +0200
commit9ce44f46754cc529d54418615862e7e27cc82f09 (patch)
tree47f6529fcc8f5d748ee347c96aeec7d345783e61 /nptl/pthread_key_delete.c
parent64a8990bdcb7f7259eb8445e8a7846345869f669 (diff)
downloadglibc-9ce44f46754cc529d54418615862e7e27cc82f09.tar.gz
glibc-9ce44f46754cc529d54418615862e7e27cc82f09.tar.xz
glibc-9ce44f46754cc529d54418615862e7e27cc82f09.zip
nptl: Move pthread_key_delete into libc.
The symbol was moved using scripts/move-symbol-to-libc.py.

tss_delete (still in libpthread) uses the __pthread_key_create
alias, so that is now exported under GLIBC_PRIVATE.
Diffstat (limited to 'nptl/pthread_key_delete.c')
-rw-r--r--nptl/pthread_key_delete.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/nptl/pthread_key_delete.c b/nptl/pthread_key_delete.c
index b9018306b1..93eedb92b8 100644
--- a/nptl/pthread_key_delete.c
+++ b/nptl/pthread_key_delete.c
@@ -19,10 +19,10 @@
 #include <errno.h>
 #include "pthreadP.h"
 #include <atomic.h>
-
+#include <shlib-compat.h>
 
 int
-__pthread_key_delete (pthread_key_t key)
+___pthread_key_delete (pthread_key_t key)
 {
   int result = EINVAL;
 
@@ -39,4 +39,14 @@ __pthread_key_delete (pthread_key_t key)
 
   return result;
 }
-weak_alias (__pthread_key_delete, pthread_key_delete)
+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);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_34)
+compat_symbol (libpthread, ___pthread_key_delete, pthread_key_delete,
+	       GLIBC_2_0);
+#endif