diff options
author | Florian Weimer <fweimer@redhat.com> | 2021-04-23 09:45:48 +0200 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2021-04-23 09:45:48 +0200 |
commit | 2e825f7d5a8a84b6389a27c138a903dfa464519a (patch) | |
tree | 8ae2b821d904fe13b80fe86e2c317ed28053f3ba /nptl | |
parent | 9f2f158b35b3f293f10158f76624b92515f8d886 (diff) | |
download | glibc-2e825f7d5a8a84b6389a27c138a903dfa464519a.tar.gz glibc-2e825f7d5a8a84b6389a27c138a903dfa464519a.tar.xz glibc-2e825f7d5a8a84b6389a27c138a903dfa464519a.zip |
nptl: Move pthread_mutexattr_getpshared into libc
The symbol was moved using scripts/move-symbol-to-libc.py.
Diffstat (limited to 'nptl')
-rw-r--r-- | nptl/Makefile | 2 | ||||
-rw-r--r-- | nptl/Versions | 2 | ||||
-rw-r--r-- | nptl/pthread_mutexattr_getpshared.c | 11 |
3 files changed, 11 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 8c9cf9ca8a..7beced1aa0 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -106,6 +106,7 @@ routines = \ pthread_mutexattr_destroy \ pthread_mutexattr_getprioceiling \ pthread_mutexattr_getprotocol \ + pthread_mutexattr_getpshared \ pthread_once \ pthread_rwlock_rdlock \ pthread_rwlock_unlock \ @@ -165,7 +166,6 @@ libpthread-routines = \ pthread_getname \ pthread_join \ pthread_join_common \ - pthread_mutexattr_getpshared \ pthread_mutexattr_getrobust \ pthread_mutexattr_gettype \ pthread_mutexattr_init \ diff --git a/nptl/Versions b/nptl/Versions index 1cb98b843e..646cb3691d 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -68,6 +68,7 @@ libc { __pthread_rwlock_unlock; __pthread_rwlock_wrlock; pthread_mutex_timedlock; + pthread_mutexattr_getpshared; } GLIBC_2.2.3 { pthread_getattr_np; @@ -284,7 +285,6 @@ libpthread { pthread_condattr_getpshared; pthread_condattr_setpshared; pthread_getcpuclockid; - pthread_mutexattr_getpshared; pthread_mutexattr_setpshared; pthread_rwlock_timedrdlock; pthread_rwlock_timedwrlock; diff --git a/nptl/pthread_mutexattr_getpshared.c b/nptl/pthread_mutexattr_getpshared.c index 37803a2707..6ec017f6d0 100644 --- a/nptl/pthread_mutexattr_getpshared.c +++ b/nptl/pthread_mutexattr_getpshared.c @@ -17,10 +17,10 @@ <https://www.gnu.org/licenses/>. */ #include <pthreadP.h> - +#include <shlib-compat.h> int -pthread_mutexattr_getpshared (const pthread_mutexattr_t *attr, int *pshared) +__pthread_mutexattr_getpshared (const pthread_mutexattr_t *attr, int *pshared) { const struct pthread_mutexattr *iattr; @@ -31,3 +31,10 @@ pthread_mutexattr_getpshared (const pthread_mutexattr_t *attr, int *pshared) return 0; } +versioned_symbol (libc, __pthread_mutexattr_getpshared, + pthread_mutexattr_getpshared, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34) +compat_symbol (libpthread, __pthread_mutexattr_getpshared, + pthread_mutexattr_getpshared, GLIBC_2_2); +#endif |