diff options
64 files changed, 77 insertions, 34 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 diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index 4278e4c985..0d9237d4f8 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -1478,6 +1478,7 @@ GLIBC_2.17 pthread_mutex_timedlock F GLIBC_2.17 pthread_mutex_trylock F GLIBC_2.17 pthread_mutex_unlock F GLIBC_2.17 pthread_mutexattr_destroy F +GLIBC_2.17 pthread_mutexattr_getprioceiling F GLIBC_2.17 pthread_once F GLIBC_2.17 pthread_rwlock_rdlock F GLIBC_2.17 pthread_rwlock_unlock F @@ -2234,6 +2235,7 @@ GLIBC_2.34 pthread_mutex_setprioceiling F GLIBC_2.34 pthread_mutex_timedlock F GLIBC_2.34 pthread_mutex_trylock F GLIBC_2.34 pthread_mutexattr_destroy F +GLIBC_2.34 pthread_mutexattr_getprioceiling F GLIBC_2.34 pthread_once F GLIBC_2.34 pthread_rwlock_rdlock F GLIBC_2.34 pthread_rwlock_unlock F diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index fc9c12f40e..98aa70d052 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -45,7 +45,6 @@ GLIBC_2.17 pthread_getcpuclockid F GLIBC_2.17 pthread_getname_np F GLIBC_2.17 pthread_join F GLIBC_2.17 pthread_mutexattr_getkind_np F -GLIBC_2.17 pthread_mutexattr_getprioceiling F GLIBC_2.17 pthread_mutexattr_getprotocol F GLIBC_2.17 pthread_mutexattr_getpshared F GLIBC_2.17 pthread_mutexattr_getrobust F diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index eb6bb08c77..554732ce01 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -2321,6 +2321,7 @@ GLIBC_2.34 pthread_mutex_setprioceiling F GLIBC_2.34 pthread_mutex_timedlock F GLIBC_2.34 pthread_mutex_trylock F GLIBC_2.34 pthread_mutexattr_destroy F +GLIBC_2.34 pthread_mutexattr_getprioceiling F GLIBC_2.34 pthread_once F GLIBC_2.34 pthread_rwlock_rdlock F GLIBC_2.34 pthread_rwlock_unlock F @@ -2512,6 +2513,7 @@ GLIBC_2.4 printf_size F GLIBC_2.4 pthread_mutex_consistent_np F GLIBC_2.4 pthread_mutex_getprioceiling F GLIBC_2.4 pthread_mutex_setprioceiling F +GLIBC_2.4 pthread_mutexattr_getprioceiling F GLIBC_2.4 qecvt F GLIBC_2.4 qecvt_r F GLIBC_2.4 qfcvt F diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist index 40ed07e2c5..a7e6bdd5c1 100644 --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist @@ -131,7 +131,6 @@ GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F GLIBC_2.31 pthread_clockjoin_np F -GLIBC_2.4 pthread_mutexattr_getprioceiling F GLIBC_2.4 pthread_mutexattr_getprotocol F GLIBC_2.4 pthread_mutexattr_getrobust_np F GLIBC_2.4 pthread_mutexattr_setprioceiling F diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist index c481b8c98e..23028736fb 100644 --- a/sysdeps/unix/sysv/linux/arc/libc.abilist +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist @@ -1406,6 +1406,7 @@ GLIBC_2.32 pthread_mutex_timedlock F GLIBC_2.32 pthread_mutex_trylock F GLIBC_2.32 pthread_mutex_unlock F GLIBC_2.32 pthread_mutexattr_destroy F +GLIBC_2.32 pthread_mutexattr_getprioceiling F GLIBC_2.32 pthread_once F GLIBC_2.32 pthread_rwlock_rdlock F GLIBC_2.32 pthread_rwlock_unlock F @@ -1993,6 +1994,7 @@ GLIBC_2.34 pthread_mutex_setprioceiling F GLIBC_2.34 pthread_mutex_timedlock F GLIBC_2.34 pthread_mutex_trylock F GLIBC_2.34 pthread_mutexattr_destroy F +GLIBC_2.34 pthread_mutexattr_getprioceiling F GLIBC_2.34 pthread_once F GLIBC_2.34 pthread_rwlock_rdlock F GLIBC_2.34 pthread_rwlock_unlock F diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist index d96bdf496d..a9d617b903 100644 --- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist @@ -60,7 +60,6 @@ GLIBC_2.32 pthread_getcpuclockid F GLIBC_2.32 pthread_getname_np F GLIBC_2.32 pthread_join F GLIBC_2.32 pthread_mutexattr_getkind_np F -GLIBC_2.32 pthread_mutexattr_getprioceiling F GLIBC_2.32 pthread_mutexattr_getprotocol F GLIBC_2.32 pthread_mutexattr_getpshared F GLIBC_2.32 pthread_mutexattr_getrobu |