diff options
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/pthread_clockjoin.c | 3 | ||||
| -rw-r--r-- | nptl/pthread_cond_wait.c | 9 | ||||
| -rw-r--r-- | nptl/pthread_mutex_timedlock.c | 8 | ||||
| -rw-r--r-- | nptl/pthread_rwlock_clockrdlock.c | 4 | ||||
| -rw-r--r-- | nptl/pthread_rwlock_clockwrlock.c | 4 | ||||
| -rw-r--r-- | nptl/pthread_rwlock_timedrdlock.c | 4 | ||||
| -rw-r--r-- | nptl/pthread_rwlock_timedwrlock.c | 4 | ||||
| -rw-r--r-- | nptl/pthread_timedjoin.c | 3 | ||||
| -rw-r--r-- | nptl/sem_clockwait.c | 3 | ||||
| -rw-r--r-- | nptl/sem_timedwait.c | 4 |
10 files changed, 22 insertions, 24 deletions
diff --git a/nptl/pthread_clockjoin.c b/nptl/pthread_clockjoin.c index f5007d7831..2d01ba03a2 100644 --- a/nptl/pthread_clockjoin.c +++ b/nptl/pthread_clockjoin.c @@ -36,7 +36,8 @@ ___pthread_clockjoin_np64 (pthread_t threadid, void **thread_return, #if __TIMESIZE == 64 strong_alias (___pthread_clockjoin_np64, ___pthread_clockjoin_np) #else /* __TIMESPEC64 != 64 */ -libc_hidden_ver (___pthread_clockjoin_np64, __pthread_clockjoin_np64) +strong_alias (___pthread_clockjoin_np64, __pthread_clockjoin_np64) +libc_hidden_def (__pthread_clockjoin_np64) int ___pthread_clockjoin_np (pthread_t threadid, void **thread_return, diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c index 409a99ecb7..daba8600fe 100644 --- a/nptl/pthread_cond_wait.c +++ b/nptl/pthread_cond_wait.c @@ -647,10 +647,8 @@ ___pthread_cond_timedwait64 (pthread_cond_t *cond, pthread_mutex_t *mutex, #if __TIMESIZE == 64 strong_alias (___pthread_cond_timedwait64, ___pthread_cond_timedwait) #else -libc_hidden_ver (___pthread_cond_timedwait64, __pthread_cond_timedwait64) -#ifndef SHARED strong_alias (___pthread_cond_timedwait64, __pthread_cond_timedwait64) -#endif +libc_hidden_def (__pthread_cond_timedwait64) int ___pthread_cond_timedwait (pthread_cond_t *cond, pthread_mutex_t *mutex, @@ -688,9 +686,8 @@ ___pthread_cond_clockwait64 (pthread_cond_t *cond, pthread_mutex_t *mutex, #if __TIMESIZE == 64 strong_alias (___pthread_cond_clockwait64, ___pthread_cond_clockwait) #else -versioned_symbol (libc, ___pthread_cond_clockwait64, - __pthread_cond_clockwait64, GLIBC_PRIVATE); -libc_hidden_ver (___pthread_cond_clockwait64, __pthread_cond_clockwait64) +strong_alias (___pthread_cond_clockwait64, __pthread_cond_clockwait64); +libc_hidden_def (__pthread_cond_clockwait64) int ___pthread_cond_clockwait (pthread_cond_t *cond, pthread_mutex_t *mutex, diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c index acd78131b2..5afd6222d6 100644 --- a/nptl/pthread_mutex_timedlock.c +++ b/nptl/pthread_mutex_timedlock.c @@ -585,7 +585,8 @@ ___pthread_mutex_clocklock64 (pthread_mutex_t *mutex, #if __TIMESIZE == 64 strong_alias (___pthread_mutex_clocklock64, ___pthread_mutex_clocklock) #else /* __TIMESPEC64 != 64 */ -libc_hidden_ver (___pthread_mutex_clocklock64, __pthread_mutex_clocklock64) +strong_alias (___pthread_mutex_clocklock64, __pthread_mutex_clocklock64) +libc_hidden_def (__pthread_mutex_clocklock64) int ___pthread_mutex_clocklock (pthread_mutex_t *mutex, @@ -618,9 +619,8 @@ ___pthread_mutex_timedlock64 (pthread_mutex_t *mutex, #if __TIMESIZE == 64 strong_alias (___pthread_mutex_timedlock64, ___pthread_mutex_timedlock) #else /* __TIMESPEC64 != 64 */ -versioned_symbol (libc, ___pthread_mutex_timedlock64, - __pthread_mutex_timedlock64, GLIBC_PRIVATE); -libc_hidden_ver (___pthread_mutex_timedlock64, __pthread_mutex_timedlock64) +strong_alias (___pthread_mutex_timedlock64, __pthread_mutex_timedlock64); +libc_hidden_def (__pthread_mutex_timedlock64) int ___pthread_mutex_timedlock (pthread_mutex_t *mutex, diff --git a/nptl/pthread_rwlock_clockrdlock.c b/nptl/pthread_rwlock_clockrdlock.c index 9db96b9904..83ae1d1823 100644 --- a/nptl/pthread_rwlock_clockrdlock.c +++ b/nptl/pthread_rwlock_clockrdlock.c @@ -31,8 +31,8 @@ ___pthread_rwlock_clockrdlock64 (pthread_rwlock_t *rwlock, clockid_t clockid, #if __TIMESIZE == 64 strong_alias (___pthread_rwlock_clockrdlock64, ___pthread_rwlock_clockrdlock) #else /* __TIMESPEC64 != 64 */ -libc_hidden_ver (___pthread_rwlock_clockrdlock64, - __pthread_rwlock_clockrdlock64) +strong_alias (___pthread_rwlock_clockrdlock64, __pthread_rwlock_clockrdlock64) +libc_hidden_def (__pthread_rwlock_clockrdlock64) int ___pthread_rwlock_clockrdlock (pthread_rwlock_t *rwlock, clockid_t clockid, diff --git a/nptl/pthread_rwlock_clockwrlock.c b/nptl/pthread_rwlock_clockwrlock.c index ca0ebe2a65..08a2276da5 100644 --- a/nptl/pthread_rwlock_clockwrlock.c +++ b/nptl/pthread_rwlock_clockwrlock.c @@ -31,8 +31,8 @@ ___pthread_rwlock_clockwrlock64 (pthread_rwlock_t *rwlock, clockid_t clockid, #if __TIMESIZE == 64 strong_alias (___pthread_rwlock_clockwrlock64, ___pthread_rwlock_clockwrlock) #else /* __TIMESPEC64 != 64 */ -libc_hidden_ver (___pthread_rwlock_clockwrlock64, - __pthread_rwlock_clockwrlock64) +strong_alias (___pthread_rwlock_clockwrlock64, __pthread_rwlock_clockwrlock64) +libc_hidden_def (__pthread_rwlock_clockwrlock64) int ___pthread_rwlock_clockwrlock (pthread_rwlock_t *rwlock, clockid_t clockid, diff --git a/nptl/pthread_rwlock_timedrdlock.c b/nptl/pthread_rwlock_timedrdlock.c index dd9b7cb0a2..8c73af26fb 100644 --- a/nptl/pthread_rwlock_timedrdlock.c +++ b/nptl/pthread_rwlock_timedrdlock.c @@ -30,8 +30,8 @@ ___pthread_rwlock_timedrdlock64 (pthread_rwlock_t *rwlock, #if __TIMESIZE == 64 strong_alias (___pthread_rwlock_timedrdlock64, ___pthread_rwlock_timedrdlock) #else /* __TIMESPEC64 != 64 */ -libc_hidden_ver (___pthread_rwlock_timedrdlock64, - __pthread_rwlock_timedrdlock64) +strong_alias (___pthread_rwlock_timedrdlock64, __pthread_rwlock_timedrdlock64) +libc_hidden_def (__pthread_rwlock_timedrdlock64) int ___pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock, diff --git a/nptl/pthread_rwlock_timedwrlock.c b/nptl/pthread_rwlock_timedwrlock.c index e660a544cd..890da92968 100644 --- a/nptl/pthread_rwlock_timedwrlock.c +++ b/nptl/pthread_rwlock_timedwrlock.c @@ -30,8 +30,8 @@ ___pthread_rwlock_timedwrlock64 (pthread_rwlock_t *rwlock, #if __TIMESIZE == 64 strong_alias (___pthread_rwlock_timedwrlock64, ___pthread_rwlock_timedwrlock) #else /* __TIMESPEC64 != 64 */ -libc_hidden_ver (___pthread_rwlock_timedwrlock64, - __pthread_rwlock_timedwrlock64) +strong_alias (___pthread_rwlock_timedwrlock64, __pthread_rwlock_timedwrlock64) +libc_hidden_def (__pthread_rwlock_timedwrlock64) int ___pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock, diff --git a/nptl/pthread_timedjoin.c b/nptl/pthread_timedjoin.c index ebc31f935a..0b4026612f 100644 --- a/nptl/pthread_timedjoin.c +++ b/nptl/pthread_timedjoin.c @@ -31,7 +31,8 @@ ___pthread_timedjoin_np64 (pthread_t threadid, void **thread_return, #if __TIMESIZE == 64 strong_alias (___pthread_timedjoin_np64, ___pthread_timedjoin_np) #else /* __TIMESPEC64 != 64 */ -libc_hidden_ver (___pthread_timedjoin_np64, __pthread_timedjoin_np64) +strong_alias (___pthread_timedjoin_np64, __pthread_timedjoin_np64) +libc_hidden_def (__pthread_timedjoin_np64) int ___pthread_timedjoin_np (pthread_t threadid, void **thread_return, diff --git a/nptl/sem_clockwait.c b/nptl/sem_clockwait.c index 2739799e26..19751aff04 100644 --- a/nptl/sem_clockwait.c +++ b/nptl/sem_clockwait.c @@ -49,7 +49,8 @@ ___sem_clockwait64 (sem_t *sem, clockid_t clockid, #if __TIMESIZE == 64 strong_alias (___sem_clockwait64, ___sem_clockwait) #else /* __TIMESPEC64 != 64 */ -libc_hidden_ver (___sem_clockwait64, __sem_clockwait64) +strong_alias (___sem_clockwait64, __sem_clockwait64) +libc_hidden_def (__sem_clockwait64) int ___sem_clockwait (sem_t *sem, clockid_t clockid, const struct timespec *abstime) diff --git a/nptl/sem_timedwait.c b/nptl/sem_timedwait.c index 584546c706..5c8f37d3bb 100644 --- a/nptl/sem_timedwait.c +++ b/nptl/sem_timedwait.c @@ -45,10 +45,8 @@ ___sem_timedwait64 (sem_t *sem, const struct __timespec64 *abstime) #if __TIMESIZE == 64 strong_alias (___sem_timedwait64, ___sem_timedwait) #else /* __TIMESPEC64 != 64 */ -libc_hidden_ver (___sem_timedwait64, __sem_timedwait64) -#ifndef SHARED strong_alias (___sem_timedwait64, __sem_timedwait64) -#endif +libc_hidden_def (__sem_timedwait64) int ___sem_timedwait (sem_t *sem, const struct timespec *abstime) |