diff options
64 files changed, 76 insertions, 33 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 51a4740123..01c383257c 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -110,6 +110,7 @@ routines = \ pthread_mutexattr_getrobust \ pthread_mutexattr_gettype \ pthread_mutexattr_init \ + pthread_mutexattr_setprioceiling \ pthread_once \ pthread_rwlock_rdlock \ pthread_rwlock_unlock \ @@ -169,7 +170,6 @@ libpthread-routines = \ pthread_getname \ pthread_join \ pthread_join_common \ - pthread_mutexattr_setprioceiling \ pthread_mutexattr_setprotocol \ pthread_mutexattr_setpshared \ pthread_mutexattr_setrobust \ diff --git a/nptl/Versions b/nptl/Versions index 1639efba7c..fde430b622 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -102,6 +102,7 @@ libc { pthread_mutexattr_getprioceiling; pthread_mutexattr_getprotocol; pthread_mutexattr_getrobust_np; + pthread_mutexattr_setprioceiling; } GLIBC_2.12 { pthread_mutex_consistent; @@ -152,6 +153,7 @@ libc { pthread_mutexattr_getrobust; pthread_mutexattr_gettype; pthread_mutexattr_init; + pthread_mutexattr_setprioceiling; pthread_once; pthread_rwlock_rdlock; pthread_rwlock_unlock; @@ -337,7 +339,6 @@ libpthread { } GLIBC_2.4 { - pthread_mutexattr_setprioceiling; pthread_mutexattr_setprotocol; pthread_mutexattr_setrobust_np; }; diff --git a/nptl/pthread_mutexattr_setprioceiling.c b/nptl/pthread_mutexattr_setprioceiling.c index 07805de626..b48f0d8c3a 100644 --- a/nptl/pthread_mutexattr_setprioceiling.c +++ b/nptl/pthread_mutexattr_setprioceiling.c @@ -20,10 +20,10 @@ #include <errno.h> #include <pthreadP.h> #include <atomic.h> - +#include <shlib-compat.h> int -pthread_mutexattr_setprioceiling (pthread_mutexattr_t *attr, int prioceiling) +__pthread_mutexattr_setprioceiling (pthread_mutexattr_t *attr, int prioceiling) { /* See __init_sched_fifo_prio. */ if (atomic_load_relaxed (&__sched_fifo_min_prio) == -1 @@ -47,3 +47,10 @@ pthread_mutexattr_setprioceiling (pthread_mutexattr_t *attr, int prioceiling) return 0; } +versioned_symbol (libc, __pthread_mutexattr_setprioceiling, + pthread_mutexattr_setprioceiling, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_4, GLIBC_2_34) +compat_symbol (libpthread, __pthread_mutexattr_setprioceiling, + pthread_mutexattr_setprioceiling, GLIBC_2_4); +#endif diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index 957b50344c..0651736847 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -1487,6 +1487,7 @@ GLIBC_2.17 pthread_mutexattr_getrobust F GLIBC_2.17 pthread_mutexattr_getrobust_np F GLIBC_2.17 pthread_mutexattr_gettype F GLIBC_2.17 pthread_mutexattr_init F +GLIBC_2.17 pthread_mutexattr_setprioceiling F GLIBC_2.17 pthread_once F GLIBC_2.17 pthread_rwlock_rdlock F GLIBC_2.17 pthread_rwlock_unlock F @@ -2250,6 +2251,7 @@ GLIBC_2.34 pthread_mutexattr_getpshared F GLIBC_2.34 pthread_mutexattr_getrobust F GLIBC_2.34 pthread_mutexattr_gettype F GLIBC_2.34 pthread_mutexattr_init F +GLIBC_2.34 pthread_mutexattr_setprioceiling 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 b3942cb152..d092fa1304 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -44,7 +44,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_setkind_np F -GLIBC_2.17 pthread_mutexattr_setprioceiling F GLIBC_2.17 pthread_mutexattr_setprotocol F GLIBC_2.17 pthread_mutexattr_setpshared F GLIBC_2.17 pthread_mutexattr_setrobust F diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index a07518dca1..281ea8e265 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -2334,6 +2334,7 @@ GLIBC_2.34 pthread_mutexattr_getpshared F GLIBC_2.34 pthread_mutexattr_getrobust F GLIBC_2.34 pthread_mutexattr_gettype F GLIBC_2.34 pthread_mutexattr_init F +GLIBC_2.34 pthread_mutexattr_setprioceiling F GLIBC_2.34 pthread_once F GLIBC_2.34 pthread_rwlock_rdlock F GLIBC_2.34 pthread_rwlock_unlock F @@ -2528,6 +2529,7 @@ GLIBC_2.4 pthread_mutex_setprioceiling 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 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 c348b752f6..b234b9262d 100644 --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist @@ -125,6 +125,5 @@ 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_setprioceiling F GLIBC_2.4 pthread_mutexattr_setprotocol F GLIBC_2.4 pthread_mutexattr_setrobust_np F diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist index fd95778265..ccb7b15c25 100644 --- a/sysdeps/unix/sysv/linux/arc/libc.abilist +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist @@ -1415,6 +1415,7 @@ GLIBC_2.32 pthread_mutexattr_getrobust F GLIBC_2.32 pthread_mutexattr_getrobust_np F GLIBC_2.32 pthread_mutexattr_gettype F GLIBC_2.32 pthread_mutexattr_init F +GLIBC_2.32 pthread_mutexattr_setprioceiling F GLIBC_2.32 pthread_once F GLIBC_2.32 pthread_rwlock_rdlock F GLIBC_2.32 pthread_rwlock_unlock F @@ -2009,6 +2010,7 @@ GLIBC_2.34 pthread_mutexattr_getpshared F GLIBC_2.34 pthread_mutexattr_getrobust F GLIBC_2.34 pthread_mutexattr_gettype F GLIBC_2.34 pthread_mutexattr_init F +GLIBC_2.34 pthread_mutexattr_setprioceiling 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 87d9fa83bb..0493a91b4b 100644 --- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist @@ -59,7 +59,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_setkind_np F -GLIBC_2.32 pthread_mutexattr_setprioceiling F GLIBC_2.32 pthread_mutexattr_setprotocol F GLIBC_2.32 pthread_mutexattr_setpshared F GLIBC_2.32 pthread_mutexattr_setrobust F |