From 9ce44f46754cc529d54418615862e7e27cc82f09 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 21 Apr 2021 19:49:51 +0200 Subject: 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. --- nptl/pthread_key_delete.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'nptl/pthread_key_delete.c') 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 #include "pthreadP.h" #include - +#include 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 -- cgit v1.2.3-70-g09d2