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:20 +0200 |
| commit | e8a9597159168db43289da50433af0ba3d8a7f92 (patch) | |
| tree | 9669509346b05e4bf95c836faf7b645165bbb292 /nptl/pthread_rwlock_trywrlock.c | |
| parent | c96dddd7311e7ffa2a7995de5c2560d9979fd962 (diff) | |
| download | glibc-e8a9597159168db43289da50433af0ba3d8a7f92.tar.gz glibc-e8a9597159168db43289da50433af0ba3d8a7f92.tar.xz glibc-e8a9597159168db43289da50433af0ba3d8a7f92.zip | |
nptl: Move pthread_rwlock_trywrlock into libc
And __pthread_rwlock_trywrlock as a compatibility symbol. Remove the unused __libc_rwlock_trywrlock macro. The symbols were 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/pthread_rwlock_trywrlock.c')
| -rw-r--r-- | nptl/pthread_rwlock_trywrlock.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/nptl/pthread_rwlock_trywrlock.c b/nptl/pthread_rwlock_trywrlock.c index 642fa724f2..242c0a1c5c 100644 --- a/nptl/pthread_rwlock_trywrlock.c +++ b/nptl/pthread_rwlock_trywrlock.c @@ -19,10 +19,11 @@ #include <errno.h> #include "pthreadP.h" #include <atomic.h> +#include <shlib-compat.h> /* See pthread_rwlock_common.c for an overview. */ int -__pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock) +___pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock) { /* When in a trywrlock, we can acquire the write lock if it is in states #1 (idle and read phase) and #5 (idle and write phase), and also in #6 @@ -64,5 +65,15 @@ __pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock) } return EBUSY; } +versioned_symbol (libc, ___pthread_rwlock_trywrlock, + pthread_rwlock_trywrlock, GLIBC_2_34); +libc_hidden_ver (___pthread_rwlock_trywrlock, __pthread_rwlock_trywrlock) -strong_alias (__pthread_rwlock_trywrlock, pthread_rwlock_trywrlock) +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34) +compat_symbol (libpthread, ___pthread_rwlock_trywrlock, + pthread_rwlock_trywrlock, GLIBC_2_1); +#endif +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34) +compat_symbol (libpthread, ___pthread_rwlock_trywrlock, + __pthread_rwlock_trywrlock, GLIBC_2_2); +#endif |