diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-04-23 09:46:03 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-04-23 09:46:03 +0200 |
| commit | 9b7ab14e112476c96e7b20fb23e6838b7012dfda (patch) | |
| tree | 19959c497b673fc06fecee555114c43f05d1e8a1 /nptl | |
| parent | 2e825f7d5a8a84b6389a27c138a903dfa464519a (diff) | |
| download | glibc-9b7ab14e112476c96e7b20fb23e6838b7012dfda.tar glibc-9b7ab14e112476c96e7b20fb23e6838b7012dfda.tar.gz glibc-9b7ab14e112476c96e7b20fb23e6838b7012dfda.tar.bz2 glibc-9b7ab14e112476c96e7b20fb23e6838b7012dfda.zip | |
nptl: Move pthread_mutexattr_getrobust into libc
And pthread_mutexattr_getrobust_np as a compat symbol.
The symbols were moved using scripts/move-symbol-to-libc.py.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | nptl/Versions | 5 | ||||
| -rw-r--r-- | nptl/pthread_mutexattr_getrobust.c | 18 |
3 files changed, 19 insertions, 6 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 7beced1aa0..196c03bd32 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -107,6 +107,7 @@ routines = \ pthread_mutexattr_getprioceiling \ pthread_mutexattr_getprotocol \ pthread_mutexattr_getpshared \ + pthread_mutexattr_getrobust \ pthread_once \ pthread_rwlock_rdlock \ pthread_rwlock_unlock \ @@ -166,7 +167,6 @@ libpthread-routines = \ pthread_getname \ pthread_join \ pthread_join_common \ - pthread_mutexattr_getrobust \ pthread_mutexattr_gettype \ pthread_mutexattr_init \ pthread_mutexattr_setprioceiling \ diff --git a/nptl/Versions b/nptl/Versions index 646cb3691d..c452d41466 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -97,9 +97,11 @@ libc { pthread_mutex_setprioceiling; pthread_mutexattr_getprioceiling; pthread_mutexattr_getprotocol; + pthread_mutexattr_getrobust_np; } GLIBC_2.12 { pthread_mutex_consistent; + pthread_mutexattr_getrobust; } # C11 thread symbols. GLIBC_2.28 { @@ -142,6 +144,7 @@ libc { pthread_mutexattr_destroy; pthread_mutexattr_getprioceiling; pthread_mutexattr_getprotocol; + pthread_mutexattr_getrobust; pthread_once; pthread_rwlock_rdlock; pthread_rwlock_unlock; @@ -331,7 +334,6 @@ libpthread { } GLIBC_2.4 { - pthread_mutexattr_getrobust_np; pthread_mutexattr_setprioceiling; pthread_mutexattr_setprotocol; pthread_mutexattr_setrobust_np; @@ -343,7 +345,6 @@ libpthread { GLIBC_2.12 { pthread_getname_np; - pthread_mutexattr_getrobust; pthread_mutexattr_setrobust; pthread_setname_np; }; diff --git a/nptl/pthread_mutexattr_getrobust.c b/nptl/pthread_mutexattr_getrobust.c index 0929898eea..7fb0a676a6 100644 --- a/nptl/pthread_mutexattr_getrobust.c +++ b/nptl/pthread_mutexattr_getrobust.c @@ -17,10 +17,11 @@ <https://www.gnu.org/licenses/>. */ #include <pthreadP.h> - +#include <shlib-compat.h> int -pthread_mutexattr_getrobust (const pthread_mutexattr_t *attr, int *robustness) +__pthread_mutexattr_getrobust (const pthread_mutexattr_t *attr, + int *robustness) { const struct pthread_mutexattr *iattr; @@ -31,4 +32,15 @@ pthread_mutexattr_getrobust (const pthread_mutexattr_t *attr, int *robustness) return 0; } -weak_alias (pthread_mutexattr_getrobust, pthread_mutexattr_getrobust_np) +versioned_symbol (libc, __pthread_mutexattr_getrobust, + pthread_mutexattr_getrobust, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_4, GLIBC_2_34) +compat_symbol (libpthread, __pthread_mutexattr_getrobust, + pthread_mutexattr_getrobust_np, GLIBC_2_4); +#endif + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_34) +compat_symbol (libpthread, __pthread_mutexattr_getrobust, + pthread_mutexattr_getrobust, GLIBC_2_12); +#endif |