diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-03 09:10:57 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-03 09:18:31 +0200 |
| commit | 9f13a95b6fa848599b40b8f038f33084c5089bc1 (patch) | |
| tree | 4ebe0772092a5137a11fd9f6d4931a26f223a1b8 /nptl | |
| parent | a8841e00d605bf437dd53223e798744bd831126f (diff) | |
| download | glibc-9f13a95b6fa848599b40b8f038f33084c5089bc1.tar.gz glibc-9f13a95b6fa848599b40b8f038f33084c5089bc1.tar.xz glibc-9f13a95b6fa848599b40b8f038f33084c5089bc1.zip | |
nptl: Move pthread_rwlockattr_getkind_np into libc
The symbol was moved using scripts/move-symbol-to-libc.py. Reviewed-by: Carlos O'Donell <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | nptl/Versions | 3 | ||||
| -rw-r--r-- | nptl/pthread_rwlockattr_getkind_np.c | 11 |
3 files changed, 12 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 97d62044c4..ea059546af 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -132,6 +132,7 @@ routines = \ pthread_rwlock_unlock \ pthread_rwlock_wrlock \ pthread_rwlockattr_destroy \ + pthread_rwlockattr_getkind_np \ pthread_self \ pthread_setcancelstate \ pthread_setcanceltype \ @@ -187,7 +188,6 @@ libpthread-routines = \ pthread_getname \ pthread_join \ pthread_join_common \ - pthread_rwlockattr_getkind_np \ pthread_rwlockattr_getpshared \ pthread_rwlockattr_init \ pthread_rwlockattr_setkind_np \ diff --git a/nptl/Versions b/nptl/Versions index 86cb6267bf..0b8d21a0ae 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -74,6 +74,7 @@ libc { pthread_rwlock_unlock; pthread_rwlock_wrlock; pthread_rwlockattr_destroy; + pthread_rwlockattr_getkind_np; } GLIBC_2.2 { __pthread_rwlock_destroy; @@ -228,6 +229,7 @@ libc { pthread_rwlock_unlock; pthread_rwlock_wrlock; pthread_rwlockattr_destroy; + pthread_rwlockattr_getkind_np; pthread_setspecific; pthread_spin_destroy; pthread_spin_init; @@ -314,7 +316,6 @@ libpthread { pthread_attr_setstacksize; pthread_create; pthread_getconcurrency; - pthread_rwlockattr_getkind_np; pthread_rwlockattr_getpshared; pthread_rwlockattr_init; pthread_rwlockattr_setkind_np; diff --git a/nptl/pthread_rwlockattr_getkind_np.c b/nptl/pthread_rwlockattr_getkind_np.c index 840b3874c2..53cecf5b99 100644 --- a/nptl/pthread_rwlockattr_getkind_np.c +++ b/nptl/pthread_rwlockattr_getkind_np.c @@ -17,12 +17,19 @@ <https://www.gnu.org/licenses/>. */ #include "pthreadP.h" - +#include <shlib-compat.h> int -pthread_rwlockattr_getkind_np (const pthread_rwlockattr_t *attr, int *pref) +__pthread_rwlockattr_getkind_np (const pthread_rwlockattr_t *attr, int *pref) { *pref = ((const struct pthread_rwlockattr *) attr)->lockkind; return 0; } +versioned_symbol (libc, __pthread_rwlockattr_getkind_np, + pthread_rwlockattr_getkind_np, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34) +compat_symbol (libpthread, __pthread_rwlockattr_getkind_np, + pthread_rwlockattr_getkind_np, GLIBC_2_1); +#endif |