Message ID | 20240904162003.821668-1-adhemerval.zanella@linaro.org |
---|---|
State | New |
Headers | show |
Series | linux: Use GLRO(dl_vdso_time) on time | expand |
* Adhemerval Zanella: > The BZ#24967 fix (1bdda52fe92fd01b424c) missed the time for > architectures that define 1bdda52fe92fd01b424c. Second 1bdda52fe92fd01b424c seems to be a cut-and-paste error. Thanks, Florian
On 04/09/24 15:16, Florian Weimer wrote: > * Adhemerval Zanella: > >> The BZ#24967 fix (1bdda52fe92fd01b424c) missed the time for >> architectures that define 1bdda52fe92fd01b424c. > > Second 1bdda52fe92fd01b424c seems to be a cut-and-paste error. Indeed, it should be USE_IFUNC_TIME.
diff --git a/sysdeps/unix/sysv/linux/time.c b/sysdeps/unix/sysv/linux/time.c index f8b0cee41c..ea929f6758 100644 --- a/sysdeps/unix/sysv/linux/time.c +++ b/sysdeps/unix/sysv/linux/time.c @@ -32,12 +32,9 @@ time_syscall (time_t *t) return INLINE_SYSCALL_CALL (time, t); } -# undef INIT_ARCH -# define INIT_ARCH() \ - void *vdso_time = dl_vdso_vsym (HAVE_TIME_VSYSCALL); libc_ifunc (time, - vdso_time ? VDSO_IFUNC_RET (vdso_time) - : (void *) time_syscall); + GLRO(dl_vdso_time) != NULL ? VDSO_IFUNC_RET (GLRO(dl_vdso_time)) + : (void *) time_syscall); # else time_t