From: Alistair Francis <alistair23@gmail.com>
To: Alistair Francis <alistair.francis@wdc.com>
Cc: GNU C Library <libc-alpha@sourceware.org>
Subject: Re: [PATCH] generic/typesizes.h: Add support for 32-bit arches with 64-bit types
Date: Thu, 16 Apr 2020 09:23:27 -0700 [thread overview]
Message-ID: <CAKmqyKP6ERXF69G_xuzDp0oMUqX-oyJD-PtW4nqJsov+31fD+Q@mail.gmail.com> (raw)
In-Reply-To: <20200401165459.2016997-1-alistair.francis@wdc.com>
On Wed, Apr 1, 2020 at 10:02 AM Alistair Francis
<alistair.francis@wdc.com> wrote:
>
> Update the default typesizes.h to match the new kernel sizes for 32-bit
> architectures with a 64-bit time_t and friends. This follows the sizes
> used for RV32 which is a y2038 safe architecture added after Linux 5.1.
Ping!
> ---
> .../unix/sysv/linux/generic/bits/typesizes.h | 37 +++++++++++++------
> 1 file changed, 25 insertions(+), 12 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/generic/bits/typesizes.h b/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
> index 4fb246ac74..05a6f6d1e5 100644
> --- a/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
> +++ b/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
> @@ -24,33 +24,46 @@
> #ifndef _BITS_TYPESIZES_H
> #define _BITS_TYPESIZES_H 1
>
> -/* See <bits/types.h> for the meaning of these macros. This file exists so
> - that <bits/types.h> need not vary across different GNU platforms. */
> +/* See <bits/types.h> for the meaning of these macros. This file exists so
> + that <bits/types.h> need not vary across different GNU platforms. */
> +#if __TIMESIZE == 64 && __WORDSIZE == 32
> +/* This is the "new" y2038 types defined for architectures added after
> + * the 5.1 kernel */
> +# define __INO_T_TYPE __UQUAD_TYPE
> +# define __OFF_T_TYPE __SQUAD_TYPE
> +# define __RLIM_T_TYPE __UQUAD_TYPE
> +# define __BLKCNT_T_TYPE __SQUAD_TYPE
> +# define __FSBLKCNT_T_TYPE __UQUAD_TYPE
> +# define __FSFILCNT_T_TYPE __UQUAD_TYPE
> +# define __TIME_T_TYPE __SQUAD_TYPE
> +# define __SUSECONDS_T_TYPE __SQUAD_TYPE
> +#else
> +# define __INO_T_TYPE __ULONGWORD_TYPE
> +# define __OFF_T_TYPE __SLONGWORD_TYPE
> +# define __RLIM_T_TYPE __ULONGWORD_TYPE
> +# define __BLKCNT_T_TYPE __SLONGWORD_TYPE
> +# define __FSBLKCNT_T_TYPE __ULONGWORD_TYPE
> +# define __FSFILCNT_T_TYPE __ULONGWORD_TYPE
> +# define __TIME_T_TYPE __SLONGWORD_TYPE
> +# define __SUSECONDS_T_TYPE __SLONGWORD_TYPE
> +#endif
>
> #define __DEV_T_TYPE __UQUAD_TYPE
> #define __UID_T_TYPE __U32_TYPE
> #define __GID_T_TYPE __U32_TYPE
> -#define __INO_T_TYPE __ULONGWORD_TYPE
> #define __INO64_T_TYPE __UQUAD_TYPE
> #define __MODE_T_TYPE __U32_TYPE
> #define __NLINK_T_TYPE __U32_TYPE
> -#define __OFF_T_TYPE __SLONGWORD_TYPE
> #define __OFF64_T_TYPE __SQUAD_TYPE
> #define __PID_T_TYPE __S32_TYPE
> -#define __RLIM_T_TYPE __ULONGWORD_TYPE
> #define __RLIM64_T_TYPE __UQUAD_TYPE
> -#define __BLKCNT_T_TYPE __SLONGWORD_TYPE
> #define __BLKCNT64_T_TYPE __SQUAD_TYPE
> -#define __FSBLKCNT_T_TYPE __ULONGWORD_TYPE
> #define __FSBLKCNT64_T_TYPE __UQUAD_TYPE
> -#define __FSFILCNT_T_TYPE __ULONGWORD_TYPE
> #define __FSFILCNT64_T_TYPE __UQUAD_TYPE
> #define __FSWORD_T_TYPE __SWORD_TYPE
> #define __ID_T_TYPE __U32_TYPE
> #define __CLOCK_T_TYPE __SLONGWORD_TYPE
> -#define __TIME_T_TYPE __SLONGWORD_TYPE
> #define __USECONDS_T_TYPE __U32_TYPE
> -#define __SUSECONDS_T_TYPE __SLONGWORD_TYPE
> #define __SUSECONDS64_T_TYPE __SQUAD_TYPE
> #define __DADDR_T_TYPE __S32_TYPE
> #define __KEY_T_TYPE __S32_TYPE
> @@ -63,7 +76,7 @@
> #define __SYSCALL_ULONG_TYPE __ULONGWORD_TYPE
> #define __CPU_MASK_TYPE __ULONGWORD_TYPE
>
> -#ifdef __LP64__
> +#if defined(__LP64__) || (__TIMESIZE == 64 && __WORDSIZE == 32)
> /* Tell the libc code that off_t and off64_t are actually the same type
> for all ABI purposes, even if possibly expressed as different base types
> for C type-checking purposes. */
> @@ -79,7 +92,7 @@
> # define __STATFS_MATCHES_STATFS64 1
>
> /* And for getitimer, setitimer and rusage */
> -# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 1
> +# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 (__WORDSIZE == 64)
> #else
> # define __RLIM_T_MATCHES_RLIM64_T 0
>
> --
> 2.26.0
>
next prev parent reply other threads:[~2020-04-16 16:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-01 16:54 Alistair Francis
2020-04-01 17:54 ` Vineet Gupta
2020-04-01 17:48 ` Alistair Francis
2020-04-01 21:24 ` Vineet Gupta
2020-04-16 16:23 ` Alistair Francis [this message]
2020-04-27 21:46 ` Alistair Francis
2020-04-28 7:59 ` Andreas Schwab
2020-04-29 16:31 ` Alistair Francis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAKmqyKP6ERXF69G_xuzDp0oMUqX-oyJD-PtW4nqJsov+31fD+Q@mail.gmail.com \
--to=alistair23@gmail.com \
--cc=alistair.francis@wdc.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).