From c96dddd7311e7ffa2a7995de5c2560d9979fd962 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 3 May 2021 09:10:57 +0200 Subject: 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 Tested-by: Carlos O'Donell --- nptl/pthread_rwlock_tryrdlock.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'nptl/pthread_rwlock_tryrdlock.c') diff --git a/nptl/pthread_rwlock_tryrdlock.c b/nptl/pthread_rwlock_tryrdlock.c index f01012f86a..495541fc78 100644 --- a/nptl/pthread_rwlock_tryrdlock.c +++ b/nptl/pthread_rwlock_tryrdlock.c @@ -25,7 +25,7 @@ /* See pthread_rwlock_common.c for an overview. */ int -__pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock) +___pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock) { /* For tryrdlock, we could speculate that we will succeed and go ahead and register as a reader. However, if we misspeculate, we have to do the @@ -116,4 +116,15 @@ __pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock) } -strong_alias (__pthread_rwlock_tryrdlock, pthread_rwlock_tryrdlock) +versioned_symbol (libc, ___pthread_rwlock_tryrdlock, + pthread_rwlock_tryrdlock, GLIBC_2_34); +libc_hidden_ver (___pthread_rwlock_tryrdlock, __pthread_rwlock_tryrdlock) + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34) +compat_symbol (libpthread, ___pthread_rwlock_tryrdlock, + pthread_rwlock_tryrdlock, GLIBC_2_1); +#endif +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34) +compat_symbol (libpthread, ___pthread_rwlock_tryrdlock, + __pthread_rwlock_tryrdlock, GLIBC_2_2); +#endif -- cgit 1.4.1