diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-04-23 09:45:09 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-04-23 09:45:09 +0200 |
| commit | d236322b6f342d13bbd3fe97cb72ca53cba1b428 (patch) | |
| tree | 9621f431a8a3cd9445993c03833888dc48af5dab /nptl | |
| parent | fd42022a10f2e54cbd1e51b561097105d8ef51c5 (diff) | |
| download | glibc-d236322b6f342d13bbd3fe97cb72ca53cba1b428.tar glibc-d236322b6f342d13bbd3fe97cb72ca53cba1b428.tar.gz glibc-d236322b6f342d13bbd3fe97cb72ca53cba1b428.tar.bz2 glibc-d236322b6f342d13bbd3fe97cb72ca53cba1b428.zip | |
nptl: Move pthread_mutexattr_getprioceiling 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 | 3 | ||||
| -rw-r--r-- | nptl/pthread_mutexattr_getprioceiling.c | 13 |
3 files changed, 13 insertions, 5 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 139945a1db..b3d547a2eb 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -104,6 +104,7 @@ routines = \ pthread_mutex_trylock \ pthread_mutex_unlock \ pthread_mutexattr_destroy \ + pthread_mutexattr_getprioceiling \ pthread_once \ pthread_rwlock_rdlock \ pthread_rwlock_unlock \ @@ -163,7 +164,6 @@ libpthread-routines = \ pthread_getname \ pthread_join \ pthread_join_common \ - pthread_mutexattr_getprioceiling \ pthread_mutexattr_getprotocol \ pthread_mutexattr_getpshared \ pthread_mutexattr_getrobust \ diff --git a/nptl/Versions b/nptl/Versions index 51857e0b8a..fe9c869795 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -94,6 +94,7 @@ libc { pthread_mutex_consistent_np; pthread_mutex_getprioceiling; pthread_mutex_setprioceiling; + pthread_mutexattr_getprioceiling; } GLIBC_2.12 { pthread_mutex_consistent; @@ -137,6 +138,7 @@ libc { pthread_mutex_getprioceiling; pthread_mutex_setprioceiling; pthread_mutexattr_destroy; + pthread_mutexattr_getprioceiling; pthread_once; pthread_rwlock_rdlock; pthread_rwlock_unlock; @@ -327,7 +329,6 @@ libpthread { } GLIBC_2.4 { - pthread_mutexattr_getprioceiling; pthread_mutexattr_getprotocol; pthread_mutexattr_getrobust_np; pthread_mutexattr_setprioceiling; diff --git a/nptl/pthread_mutexattr_getprioceiling.c b/nptl/pthread_mutexattr_getprioceiling.c index b2002a63a9..0e1a055083 100644 --- a/nptl/pthread_mutexattr_getprioceiling.c +++ b/nptl/pthread_mutexattr_getprioceiling.c @@ -19,11 +19,11 @@ #include <pthreadP.h> #include <atomic.h> - +#include <shlib-compat.h> int -pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *attr, - int *prioceiling) +__pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *attr, + int *prioceiling) { const struct pthread_mutexattr *iattr; int ceiling; @@ -46,3 +46,10 @@ pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *attr, return 0; } +versioned_symbol (libc, __pthread_mutexattr_getprioceiling, + pthread_mutexattr_getprioceiling, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_4, GLIBC_2_34) +compat_symbol (libpthread, __pthread_mutexattr_getprioceiling, + pthread_mutexattr_getprioceiling, GLIBC_2_4); +#endif |