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:35 +0200 |
| commit | 0af0ccc2d58f8b220fda10f8d1147d84ed8b88a0 (patch) | |
| tree | c9355b570b110d247525ff9a34f41d684329c772 /nptl | |
| parent | 9f13a95b6fa848599b40b8f038f33084c5089bc1 (diff) | |
| download | glibc-0af0ccc2d58f8b220fda10f8d1147d84ed8b88a0.zip glibc-0af0ccc2d58f8b220fda10f8d1147d84ed8b88a0.tar.gz glibc-0af0ccc2d58f8b220fda10f8d1147d84ed8b88a0.tar.bz2 | |
nptl: Move pthread_rwlockattr_getpshared 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_getpshared.c | 12 |
3 files changed, 13 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index ea05954..7724bed 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -133,6 +133,7 @@ routines = \ pthread_rwlock_wrlock \ pthread_rwlockattr_destroy \ pthread_rwlockattr_getkind_np \ + pthread_rwlockattr_getpshared \ pthread_self \ pthread_setcancelstate \ pthread_setcanceltype \ @@ -188,7 +189,6 @@ libpthread-routines = \ pthread_getname \ pthread_join \ pthread_join_common \ - pthread_rwlockattr_getpshared \ pthread_rwlockattr_init \ pthread_rwlockattr_setkind_np \ pthread_rwlockattr_setpshared \ diff --git a/nptl/Versions b/nptl/Versions index 0b8d21a..1ca7c77 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -75,6 +75,7 @@ libc { pthread_rwlock_wrlock; pthread_rwlockattr_destroy; pthread_rwlockattr_getkind_np; + pthread_rwlockattr_getpshared; } GLIBC_2.2 { __pthread_rwlock_destroy; @@ -230,6 +231,7 @@ libc { pthread_rwlock_wrlock; pthread_rwlockattr_destroy; pthread_rwlockattr_getkind_np; + pthread_rwlockattr_getpshared; pthread_setspecific; pthread_spin_destroy; pthread_spin_init; @@ -316,7 +318,6 @@ libpthread { pthread_attr_setstacksize; pthread_create; pthread_getconcurrency; - pthread_rwlockattr_getpshared; pthread_rwlockattr_init; pthread_rwlockattr_setkind_np; pthread_rwlockattr_setpshared; diff --git a/nptl/pthread_rwlockattr_getpshared.c b/nptl/pthread_rwlockattr_getpshared.c index bf62eee..3e126e7 100644 --- a/nptl/pthread_rwlockattr_getpshared.c +++ b/nptl/pthread_rwlockattr_getpshared.c @@ -17,12 +17,20 @@ <https://www.gnu.org/licenses/>. */ #include "pthreadP.h" - +#include <shlib-compat.h> int -pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *attr, int *pshared) +__pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *attr, + int *pshared) { *pshared = ((const struct pthread_rwlockattr *) attr)->pshared; return 0; } +versioned_symbol (libc, __pthread_rwlockattr_getpshared, + pthread_rwlockattr_getpshared, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34) +compat_symbol (libpthread, __pthread_rwlockattr_getpshared, + pthread_rwlockattr_getpshared, GLIBC_2_1); +#endif |