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:16 +0200 |
| commit | c96dddd7311e7ffa2a7995de5c2560d9979fd962 (patch) | |
| tree | 0aebeb973544f89fd5cbb23e874cb8076b7b6f03 /sysdeps/nptl | |
| parent | e7d2d48e560a2091e2a03c527c333cd7b5618b25 (diff) | |
| download | glibc-c96dddd7311e7ffa2a7995de5c2560d9979fd962.tar glibc-c96dddd7311e7ffa2a7995de5c2560d9979fd962.tar.gz glibc-c96dddd7311e7ffa2a7995de5c2560d9979fd962.tar.bz2 glibc-c96dddd7311e7ffa2a7995de5c2560d9979fd962.zip | |
nptl: Move pthread_rwlock_tryrdlock into libc
And __pthread_rwlock_tryrdlock as a compatibility symbol.
Remove the unused __libc_rwlock_tryrdlock 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 'sysdeps/nptl')
| -rw-r--r-- | sysdeps/nptl/libc-lockP.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sysdeps/nptl/libc-lockP.h b/sysdeps/nptl/libc-lockP.h index 16a303e084..5bb1d5c5be 100644 --- a/sysdeps/nptl/libc-lockP.h +++ b/sysdeps/nptl/libc-lockP.h @@ -150,8 +150,6 @@ _Static_assert (LLL_LOCK_INITIALIZER == 0, "LLL_LOCK_INITIALIZER != 0"); # define __libc_lock_trylock(NAME) \ __libc_maybe_call (__pthread_mutex_trylock, (&(NAME)), 0) #endif -#define __libc_rwlock_tryrdlock(NAME) \ - __libc_maybe_call (__pthread_rwlock_tryrdlock, (&(NAME)), 0) #define __libc_rwlock_trywrlock(NAME) \ __libc_maybe_call (__pthread_rwlock_trywrlock, (&(NAME)), 0) @@ -268,7 +266,6 @@ extern int __pthread_rwlock_destroy (pthread_rwlock_t *__rwlock); extern int __pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock); libc_hidden_proto (__pthread_rwlock_rdlock) -extern int __pthread_rwlock_tryrdlock (pthread_rwlock_t *__rwlock); extern int __pthread_rwlock_wrlock (pthread_rwlock_t *__rwlock); libc_hidden_proto (__pthread_rwlock_wrlock) @@ -293,14 +290,12 @@ libc_hidden_proto (__pthread_setcancelstate) # ifdef weak_extern weak_extern (__pthread_mutex_trylock) weak_extern (__pthread_mutexattr_destroy) -weak_extern (__pthread_rwlock_tryrdlock) weak_extern (__pthread_rwlock_trywrlock) weak_extern (__pthread_initialize) weak_extern (__pthread_atfork) # else # pragma weak __pthread_mutex_trylock # pragma weak __pthread_mutexattr_destroy -# pragma weak __pthread_rwlock_tryrdlock # pragma weak __pthread_rwlock_trywrlock # pragma weak __pthread_initialize # pragma weak __pthread_atfork |