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:17:27 +0200 |
| commit | 2cf5b43bcb392af5f056250560d5711b8ba802c4 (patch) | |
| tree | 6c2c968378f2d7658d2cbbacb1cafc2d245cd270 /nptl/pthread_rwlock_clockwrlock.c | |
| parent | 0ace9b197c454166808e466b931a0f827a7b785c (diff) | |
| download | glibc-2cf5b43bcb392af5f056250560d5711b8ba802c4.tar.gz glibc-2cf5b43bcb392af5f056250560d5711b8ba802c4.tar.xz glibc-2cf5b43bcb392af5f056250560d5711b8ba802c4.zip | |
nptl: Move pthread_rwlock_clockwrlock 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_clockwrlock.c')
| -rw-r--r-- | nptl/pthread_rwlock_clockwrlock.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/nptl/pthread_rwlock_clockwrlock.c b/nptl/pthread_rwlock_clockwrlock.c index 22c3a7874d..ca0ebe2a65 100644 --- a/nptl/pthread_rwlock_clockwrlock.c +++ b/nptl/pthread_rwlock_clockwrlock.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_clockwrlock64 (pthread_rwlock_t *rwlock, clockid_t clockid, - const struct __timespec64 *abstime) +___pthread_rwlock_clockwrlock64 (pthread_rwlock_t *rwlock, clockid_t clockid, + const struct __timespec64 *abstime) { return __pthread_rwlock_wrlock_full64 (rwlock, clockid, abstime); } -#if __TIMESIZE != 64 -libpthread_hidden_def (__pthread_rwlock_clockwrlock64) +#if __TIMESIZE == 64 +strong_alias (___pthread_rwlock_clockwrlock64, ___pthread_rwlock_clockwrlock) +#else /* __TIMESPEC64 != 64 */ +libc_hidden_ver (___pthread_rwlock_clockwrlock64, + __pthread_rwlock_clockwrlock64) int -__pthread_rwlock_clockwrlock (pthread_rwlock_t *rwlock, clockid_t clockid, - const struct timespec *abstime) +___pthread_rwlock_clockwrlock (pthread_rwlock_t *rwlock, clockid_t clockid, + const struct timespec *abstime) { struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime); return __pthread_rwlock_clockwrlock64 (rwlock, clockid, &ts64); } +#endif /* __TIMESPEC64 != 64 */ +versioned_symbol (libc, ___pthread_rwlock_clockwrlock, + pthread_rwlock_clockwrlock, GLIBC_2_34); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_30, GLIBC_2_34) +compat_symbol (libpthread, ___pthread_rwlock_clockwrlock, + pthread_rwlock_clockwrlock, GLIBC_2_30); #endif -weak_alias (__pthread_rwlock_clockwrlock, pthread_rwlock_clockwrlock) |