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:16:49 +0200 |
| commit | 0ace9b197c454166808e466b931a0f827a7b785c (patch) | |
| tree | 49075ef16d1c3e171d3abfb754ddd8715cad37d2 /nptl/pthread_rwlock_clockrdlock.c | |
| parent | 2c5c5c87c981fd68e7f646db0d479311e820c2f7 (diff) | |
| download | glibc-0ace9b197c454166808e466b931a0f827a7b785c.zip glibc-0ace9b197c454166808e466b931a0f827a7b785c.tar.gz glibc-0ace9b197c454166808e466b931a0f827a7b785c.tar.bz2 | |
nptl: Move pthread_rwlock_clockrdlock 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/pthread_rwlock_clockrdlock.c')
| -rw-r--r-- | nptl/pthread_rwlock_clockrdlock.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/nptl/pthread_rwlock_clockrdlock.c b/nptl/pthread_rwlock_clockrdlock.c index 6c8e50a..9db96b9 100644 --- a/nptl/pthread_rwlock_clockrdlock.c +++ b/nptl/pthread_rwlock_clockrdlock.c @@ -18,25 +18,34 @@ <https://www.gnu.org/licenses/>. */ #include "pthread_rwlock_common.c" +#include <shlib-compat.h> /* See pthread_rwlock_common.c. */ int -__pthread_rwlock_clockrdlock64 (pthread_rwlock_t *rwlock, clockid_t clockid, - const struct __timespec64 *abstime) +___pthread_rwlock_clockrdlock64 (pthread_rwlock_t *rwlock, clockid_t clockid, + const struct __timespec64 *abstime) { return __pthread_rwlock_rdlock_full64 (rwlock, clockid, abstime); } -#if __TIMESIZE != 64 -libpthread_hidden_def (__pthread_rwlock_clockrdlock64) +#if __TIMESIZE == 64 +strong_alias (___pthread_rwlock_clockrdlock64, ___pthread_rwlock_clockrdlock) +#else /* __TIMESPEC64 != 64 */ +libc_hidden_ver (___pthread_rwlock_clockrdlock64, + __pthread_rwlock_clockrdlock64) int -__pthread_rwlock_clockrdlock (pthread_rwlock_t *rwlock, clockid_t clockid, - const struct timespec *abstime) +___pthread_rwlock_clockrdlock (pthread_rwlock_t *rwlock, clockid_t clockid, + const struct timespec *abstime) { struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime); return __pthread_rwlock_clockrdlock64 (rwlock, clockid, &ts64); } +#endif /* __TIMESPEC64 != 64 */ +versioned_symbol (libc, ___pthread_rwlock_clockrdlock, + pthread_rwlock_clockrdlock, GLIBC_2_34); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_30, GLIBC_2_34) +compat_symbol (libpthread, ___pthread_rwlock_clockrdlock, + pthread_rwlock_clockrdlock, GLIBC_2_30); #endif -weak_alias (__pthread_rwlock_clockrdlock, pthread_rwlock_clockrdlock) |