From 8f72bed1aa42105cd2353333363f2138c7d531a9 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 17 May 2021 09:59:14 +0200 Subject: nptl: Move pthread_getattr_default_np into libc The symbol was moved using scripts/move-symbol-to-libc.py. A new placeholder symbol __libpthread_version_placeholder@GLIBC_2.18 is needed to keep the GLIBC_2.18 symbol version in libpthread. The __pthread_getattr_default_np@@GLIBC_PRIVATE export is used from pthread_create. Reviewed-by: Adhemerval Zanella --- nptl/pthread_getattr_default_np.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'nptl/pthread_getattr_default_np.c') diff --git a/nptl/pthread_getattr_default_np.c b/nptl/pthread_getattr_default_np.c index c403d1231c..f38f687431 100644 --- a/nptl/pthread_getattr_default_np.c +++ b/nptl/pthread_getattr_default_np.c @@ -17,14 +17,22 @@ . */ #include +#include int -__pthread_getattr_default_np (pthread_attr_t *out) +___pthread_getattr_default_np (pthread_attr_t *out) { lll_lock (__default_pthread_attr_lock, LLL_PRIVATE); int ret = __pthread_attr_copy (out, &__default_pthread_attr.external); lll_unlock (__default_pthread_attr_lock, LLL_PRIVATE); return ret; } -libpthread_hidden_def (__pthread_getattr_default_np) -weak_alias (__pthread_getattr_default_np, pthread_getattr_default_np) +versioned_symbol (libc, ___pthread_getattr_default_np, + pthread_getattr_default_np, GLIBC_2_34); +versioned_symbol (libc, ___pthread_getattr_default_np, + __pthread_getattr_default_np, GLIBC_PRIVATE); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_18, GLIBC_2_34) +compat_symbol (libpthread, ___pthread_getattr_default_np, + pthread_getattr_default_np, GLIBC_2_18); +#endif -- cgit 1.4.1