diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-04-23 09:45:29 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-04-23 09:45:29 +0200 |
| commit | 9f2f158b35b3f293f10158f76624b92515f8d886 (patch) | |
| tree | b93d7fa9234825b880d90d949a0ff571ac6b5aa6 /nptl | |
| parent | d236322b6f342d13bbd3fe97cb72ca53cba1b428 (diff) | |
| download | glibc-9f2f158b35b3f293f10158f76624b92515f8d886.tar.gz glibc-9f2f158b35b3f293f10158f76624b92515f8d886.tar.xz glibc-9f2f158b35b3f293f10158f76624b92515f8d886.zip | |
nptl: Move pthread_mutexattr_getprotocol 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_getprotocol.c | 11 |
3 files changed, 12 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index b3d547a2eb..8c9cf9ca8a 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -105,6 +105,7 @@ routines = \ pthread_mutex_unlock \ pthread_mutexattr_destroy \ pthread_mutexattr_getprioceiling \ + pthread_mutexattr_getprotocol \ pthread_once \ pthread_rwlock_rdlock \ pthread_rwlock_unlock \ @@ -164,7 +165,6 @@ libpthread-routines = \ pthread_getname \ pthread_join \ pthread_join_common \ - pthread_mutexattr_getprotocol \ pthread_mutexattr_getpshared \ pthread_mutexattr_getrobust \ pthread_mutexattr_gettype \ diff --git a/nptl/Versions b/nptl/Versions index fe9c869795..1cb98b843e 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -95,6 +95,7 @@ libc { pthread_mutex_getprioceiling; pthread_mutex_setprioceiling; pthread_mutexattr_getprioceiling; + pthread_mutexattr_getprotocol; } GLIBC_2.12 { pthread_mutex_consistent; @@ -139,6 +140,7 @@ libc { pthread_mutex_setprioceiling; pthread_mutexattr_destroy; pthread_mutexattr_getprioceiling; + pthread_mutexattr_getprotocol; pthread_once; pthread_rwlock_rdlock; pthread_rwlock_unlock; @@ -329,7 +331,6 @@ libpthread { } GLIBC_2.4 { - pthread_mutexattr_getprotocol; pthread_mutexattr_getrobust_np; pthread_mutexattr_setprioceiling; pthread_mutexattr_setprotocol; diff --git a/nptl/pthread_mutexattr_getprotocol.c b/nptl/pthread_mutexattr_getprotocol.c index f970eab854..685f95a84e 100644 --- a/nptl/pthread_mutexattr_getprotocol.c +++ b/nptl/pthread_mutexattr_getprotocol.c @@ -18,10 +18,10 @@ <https://www.gnu.org/licenses/>. */ #include <pthreadP.h> - +#include <shlib-compat.h> int -pthread_mutexattr_getprotocol (const pthread_mutexattr_t *attr, int *protocol) +__pthread_mutexattr_getprotocol (const pthread_mutexattr_t *attr, int *protocol) { const struct pthread_mutexattr *iattr; @@ -32,3 +32,10 @@ pthread_mutexattr_getprotocol (const pthread_mutexattr_t *attr, int *protocol) return 0; } +versioned_symbol (libc, __pthread_mutexattr_getprotocol, + pthread_mutexattr_getprotocol, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_4, GLIBC_2_34) +compat_symbol (libpthread, __pthread_mutexattr_getprotocol, + pthread_mutexattr_getprotocol, GLIBC_2_4); +#endif |