diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-17 09:59:14 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-17 10:25:11 +0200 |
| commit | 8f72bed1aa42105cd2353333363f2138c7d531a9 (patch) | |
| tree | b3413f04a2c2a15ffb90df8909dad5b343b69f65 /nptl/pthread_getattr_default_np.c | |
| parent | 9dc21009a47300f62b2a1fd9fec2270a21bd7c3d (diff) | |
| download | glibc-8f72bed1aa42105cd2353333363f2138c7d531a9.tar.gz glibc-8f72bed1aa42105cd2353333363f2138c7d531a9.tar.xz glibc-8f72bed1aa42105cd2353333363f2138c7d531a9.zip | |
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 <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl/pthread_getattr_default_np.c')
| -rw-r--r-- | nptl/pthread_getattr_default_np.c | 14 |
1 files changed, 11 insertions, 3 deletions
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 @@ <https://www.gnu.org/licenses/>. */ #include <pthreadP.h> +#include <shlib-compat.h> 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 |