This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] tst-clone3: Use __NR_futex_time64 if we don't have __NR_futex
- From: Arnd Bergmann <arnd at arndb dot de>
- To: Alistair Francis <alistair dot francis at wdc dot com>
- Cc: GNU C Library <libc-alpha at sourceware dot org>, Alistair Francis <alistair23 at gmail dot com>
- Date: Fri, 31 Jan 2020 22:47:26 +0100
- Subject: Re: [PATCH] tst-clone3: Use __NR_futex_time64 if we don't have __NR_futex
- References: <20200131170354.25539-1-alistair.francis@wdc.com>
On Fri, Jan 31, 2020 at 6:10 PM Alistair Francis
<alistair.francis@wdc.com> wrote:
>
> We can't include sysdep.h in the test case (it introduces lots of
> strange failures) so __NR_futex isn't redifined to __NR_futex_time64 by
> 64-bit time_t 32-bit archs (y2038 safe).
>
> To allow the test to pass let's just do the __NR_futex_time64 syscall if
> we don't have __NR_futex defined.
> ---
> sysdeps/unix/sysv/linux/tst-clone3.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/sysdeps/unix/sysv/linux/tst-clone3.c b/sysdeps/unix/sysv/linux/tst-clone3.c
> index 400eb89a5b..613cb4a811 100644
> --- a/sysdeps/unix/sysv/linux/tst-clone3.c
> +++ b/sysdeps/unix/sysv/linux/tst-clone3.c
> @@ -56,7 +56,11 @@ f (void *a)
> static inline int
> futex_wait (int *futexp, int val)
> {
> +#ifdef __NR_futex
> return syscall (__NR_futex, futexp, FUTEX_WAIT, val);
> +#else
> + return syscall (__NR_futex_time64, futexp, FUTEX_WAIT, val);
> +#endif
> }
There are other references to __NR_futex and INTERNAL_SYSCALL (futex, ...)
that likely suffer from the same problem. Would it make sense to address
those all at once?
Arnd