diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-02-17 13:35:19 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-06-15 10:42:11 -0300 |
commit | 47f24c21ee38701ae275aa9e451f70fa3e77478c (patch) | |
tree | b4cc52206173fb2ed427a1e797769d12369a89ad /nptl | |
parent | 8af344feb5ae3e6e3374a6cf2175b44cc904a94e (diff) | |
download | glibc-47f24c21ee38701ae275aa9e451f70fa3e77478c.tar.gz glibc-47f24c21ee38701ae275aa9e451f70fa3e77478c.tar.xz glibc-47f24c21ee38701ae275aa9e451f70fa3e77478c.zip |
y2038: Add support for 64-bit time on legacy ABIs
A new build flag, _TIME_BITS, enables the usage of the newer 64-bit time symbols for legacy ABI (where 32-bit time_t is default). The 64 bit time support is only enabled if LFS (_FILE_OFFSET_BITS=64) is also used. Different than LFS support, the y2038 symbols are added only for the required ABIs (armhf, csky, hppa, i386, m68k, microblaze, mips32, mips64-n32, nios2, powerpc32, sparc32, s390-32, and sh). The ABIs with 64-bit time support are unchanged, both for symbol and types redirection. On Linux the full 64-bit time support requires a minimum of kernel version v5.1. Otherwise, the 32-bit fallbacks are used and might results in error with overflow return code (EOVERFLOW). The i686-gnu does not yet support 64-bit time. This patch exports following rediretions to support 64-bit time: * libc: adjtime adjtimex clock_adjtime clock_getres clock_gettime clock_nanosleep clock_settime cnd_timedwait ctime ctime_r difftime fstat fstatat futimens futimes futimesat getitimer getrusage gettimeofday gmtime gmtime_r localtime localtime_r lstat_time lutimes mktime msgctl mtx_timedlock nanosleep nanosleep ntp_gettime ntp_gettimex ppoll pselec pselect pthread_clockjoin_np pthread_cond_clockwait pthread_cond_timedwait pthread_mutex_clocklock pthread_mutex_timedlock pthread_rwlock_clockrdlock pthread_rwlock_clockwrlock pthread_rwlock_timedrdlock pthread_rwlock_timedwrlock pthread_timedjoin_np recvmmsg sched_rr_get_interval select sem_clockwait semctl semtimedop sem_timedwait setitimer settimeofday shmctl sigtimedwait stat thrd_sleep time timegm timerfd_gettime timerfd_settime timespec_get utime utimensat utimes utimes wait3 wait4 * librt: aio_suspend mq_timedreceive mq_timedsend timer_gettime timer_settime * libanl: gai_suspend Reviewed-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Carlos O'Donell <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com>
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) |