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:04 +0200 |
| commit | 2392feb17188fed30bc16fd032e0a43e022b8ead (patch) | |
| tree | 0580b921bec4d9771d036e0995ef8bf2a0309db1 /nptl/pthread_rwlock_timedrdlock.c | |
| parent | 63627246f3e0aae274e04a8ef1edcd05a11afa65 (diff) | |
| download | glibc-2392feb17188fed30bc16fd032e0a43e022b8ead.zip glibc-2392feb17188fed30bc16fd032e0a43e022b8ead.tar.gz glibc-2392feb17188fed30bc16fd032e0a43e022b8ead.tar.bz2 | |
nptl: Move pthread_rwlock_timedrdlock 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_timedrdlock.c')
| -rw-r--r-- | nptl/pthread_rwlock_timedrdlock.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/nptl/pthread_rwlock_timedrdlock.c b/nptl/pthread_rwlock_timedrdlock.c index db02ee7..dd9b7cb 100644 --- a/nptl/pthread_rwlock_timedrdlock.c +++ b/nptl/pthread_rwlock_timedrdlock.c @@ -17,25 +17,34 @@ <https://www.gnu.org/licenses/>. */ #include "pthread_rwlock_common.c" +#include <shlib-compat.h> /* See pthread_rwlock_common.c. */ int -__pthread_rwlock_timedrdlock64 (pthread_rwlock_t *rwlock, - const struct __timespec64 *abstime) +___pthread_rwlock_timedrdlock64 (pthread_rwlock_t *rwlock, + const struct __timespec64 *abstime) { return __pthread_rwlock_rdlock_full64 (rwlock, CLOCK_REALTIME, abstime); } -#if __TIMESIZE != 64 -libpthread_hidden_def (__pthread_rwlock_timedrdlock64) +#if __TIMESIZE == 64 +strong_alias (___pthread_rwlock_timedrdlock64, ___pthread_rwlock_timedrdlock) +#else /* __TIMESPEC64 != 64 */ +libc_hidden_ver (___pthread_rwlock_timedrdlock64, + __pthread_rwlock_timedrdlock64) int -__pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock, - const struct timespec *abstime) +___pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock, + const struct timespec *abstime) { struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime); return __pthread_rwlock_timedrdlock64 (rwlock, &ts64); } +#endif /* __TIMESPEC64 != 64 */ +versioned_symbol (libc, ___pthread_rwlock_timedrdlock, + pthread_rwlock_timedrdlock, GLIBC_2_34); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34) +compat_symbol (libpthread, ___pthread_rwlock_timedrdlock, + pthread_rwlock_timedrdlock, GLIBC_2_2); #endif -weak_alias (__pthread_rwlock_timedrdlock, pthread_rwlock_timedrdlock) |