From 64a8990bdcb7f7259eb8445e8a7846345869f669 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 21 Apr 2021 19:49:51 +0200 Subject: nptl: Move pthread_setspecific, __pthread_setspecific into libc The symbols have been moved using scripts/move-symbol-to-libc.py. --- nptl/pthread_setspecific.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'nptl/pthread_setspecific.c') diff --git a/nptl/pthread_setspecific.c b/nptl/pthread_setspecific.c index a6e84cd001..fdcab3b6d9 100644 --- a/nptl/pthread_setspecific.c +++ b/nptl/pthread_setspecific.c @@ -19,10 +19,10 @@ #include #include #include "pthreadP.h" - +#include int -__pthread_setspecific (pthread_key_t key, const void *value) +___pthread_setspecific (pthread_key_t key, const void *value) { struct pthread *self; unsigned int idx1st; @@ -89,5 +89,17 @@ __pthread_setspecific (pthread_key_t key, const void *value) return 0; } -weak_alias (__pthread_setspecific, pthread_setspecific) -hidden_def (__pthread_setspecific) +versioned_symbol (libc, ___pthread_setspecific, __pthread_setspecific, + GLIBC_2_34); +libc_hidden_ver (___pthread_setspecific, __pthread_setspecific) + +/* Several aliases for setting different symbol versions. */ + +versioned_symbol (libc, ___pthread_setspecific, pthread_setspecific, + GLIBC_2_34); +#if OTHER_SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_34) +compat_symbol (libpthread, ___pthread_setspecific, __pthread_setspecific, + GLIBC_2_0); +compat_symbol (libpthread, ___pthread_setspecific, pthread_setspecific, + GLIBC_2_0); +#endif -- cgit 1.4.1