diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-04-23 09:42:51 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-04-23 09:42:51 +0200 |
| commit | 4b85c6f55fa9be1b1ff2c5ac67c8dcb63f883789 (patch) | |
| tree | da11a95640f57027d7cc53727835b35de55fbbd4 /nptl | |
| parent | 10624a97e8e47004985740cbb04060a84cfada76 (diff) | |
| download | glibc-4b85c6f55fa9be1b1ff2c5ac67c8dcb63f883789.tar.gz glibc-4b85c6f55fa9be1b1ff2c5ac67c8dcb63f883789.tar.xz glibc-4b85c6f55fa9be1b1ff2c5ac67c8dcb63f883789.zip | |
nptl: Move pthread_mutex_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_mutex_getprioceiling.c | 11 |
3 files changed, 12 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 294bb2faa4..2f8cebb760 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -96,6 +96,7 @@ routines = \ pthread_mutex_conf \ pthread_mutex_consistent \ pthread_mutex_destroy \ + pthread_mutex_getprioceiling \ pthread_mutex_init \ pthread_mutex_lock \ pthread_mutex_unlock \ @@ -158,7 +159,6 @@ libpthread-routines = \ pthread_getname \ pthread_join \ pthread_join_common \ - pthread_mutex_getprioceiling \ pthread_mutex_setprioceiling \ pthread_mutex_timedlock \ pthread_mutex_trylock \ diff --git a/nptl/Versions b/nptl/Versions index a14f404f88..88c934369f 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -87,6 +87,7 @@ libc { } GLIBC_2.4 { pthread_mutex_consistent_np; + pthread_mutex_getprioceiling; } GLIBC_2.12 { pthread_mutex_consistent; @@ -125,6 +126,7 @@ libc { pthread_key_delete; pthread_kill; pthread_mutex_consistent; + pthread_mutex_getprioceiling; pthread_once; pthread_rwlock_rdlock; pthread_rwlock_unlock; @@ -319,7 +321,6 @@ libpthread { } GLIBC_2.4 { - pthread_mutex_getprioceiling; pthread_mutex_setprioceiling; pthread_mutexattr_getprioceiling; pthread_mutexattr_getprotocol; diff --git a/nptl/pthread_mutex_getprioceiling.c b/nptl/pthread_mutex_getprioceiling.c index 8c0a380f5e..7e4ca7683f 100644 --- a/nptl/pthread_mutex_getprioceiling.c +++ b/nptl/pthread_mutex_getprioceiling.c @@ -19,10 +19,10 @@ #include <errno.h> #include <pthreadP.h> - +#include <shlib-compat.h> int -pthread_mutex_getprioceiling (const pthread_mutex_t *mutex, int *prioceiling) +__pthread_mutex_getprioceiling (const pthread_mutex_t *mutex, int *prioceiling) { /* See concurrency notes regarding __kind in struct __pthread_mutex_s in sysdeps/nptl/bits/thread-shared-types.h. */ @@ -35,3 +35,10 @@ pthread_mutex_getprioceiling (const pthread_mutex_t *mutex, int *prioceiling) return 0; } +versioned_symbol (libc, __pthread_mutex_getprioceiling, + pthread_mutex_getprioceiling, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_4, GLIBC_2_34) +compat_symbol (libpthread, __pthread_mutex_getprioceiling, + pthread_mutex_getprioceiling, GLIBC_2_4); +#endif |