From: Lukasz Majewski <lukma@denx.de>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: Alistair Francis <alistair.francis@wdc.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH 5/5] Remove __WORDSIZE_TIME64_COMPAT32
Date: Thu, 22 Oct 2020 11:31:27 +0200 [thread overview]
Message-ID: <20201022113127.407946d6@jawa> (raw)
In-Reply-To: <20200729205117.2925113-5-adhemerval.zanella@linaro.org>
[-- Attachment #1: Type: text/plain, Size: 9422 bytes --]
Hi Adhemerval,
> With 'struct utmpx', 'struct utmp', and 'struct lastlog' using
> 64-bit time unconditionally this macro is not used anymore.
> ---
> bits/wordsize.h | 6 ------
> sysdeps/aarch64/bits/wordsize.h | 2 --
> sysdeps/mips/bits/wordsize.h | 6 ------
> sysdeps/powerpc/powerpc32/bits/wordsize.h | 2 --
> sysdeps/powerpc/powerpc64/bits/wordsize.h | 2 --
> sysdeps/riscv/bits/wordsize.h | 6 ------
> sysdeps/s390/s390-32/bits/wordsize.h | 2 --
> sysdeps/s390/s390-64/bits/wordsize.h | 2 --
> sysdeps/sparc/sparc32/bits/wordsize.h | 2 --
> sysdeps/sparc/sparc64/bits/wordsize.h | 2 --
> sysdeps/unix/sysv/linux/alpha/bits/wordsize.h | 1 -
> sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h | 2 --
> sysdeps/unix/sysv/linux/sparc/bits/wordsize.h | 2 --
> sysdeps/wordsize-32/bits/wordsize.h | 1 -
> sysdeps/wordsize-64/bits/wordsize.h | 1 -
> sysdeps/x86/bits/wordsize.h | 3 ---
> 16 files changed, 42 deletions(-)
>
> diff --git a/bits/wordsize.h b/bits/wordsize.h
> index 14edae3a11..e20fd2e4c2 100644
> --- a/bits/wordsize.h
> +++ b/bits/wordsize.h
> @@ -19,9 +19,3 @@
> __WORDSIZE is 32 and ptrdiff_t is type 'int' and leave undefined
> if __WORDSIZE is 64. */
> #define __WORDSIZE32_PTRDIFF_LONG
> -
> -/* Set to 1 in order to force time types to be 32 bits instead of 64
> bits in
> - struct lastlog and struct utmp{,x} on 64-bit ports. This may be
> done in
> - order to make 64-bit ports compatible with 32-bit ports. Set to
> 0 for
> - 64-bit ports where the time types are 64-bits or for any 32-bit
> ports. */ -#define __WORDSIZE_TIME64_COMPAT32
> diff --git a/sysdeps/aarch64/bits/wordsize.h
> b/sysdeps/aarch64/bits/wordsize.h index ee01841773..adc083d662 100644
> --- a/sysdeps/aarch64/bits/wordsize.h
> +++ b/sysdeps/aarch64/bits/wordsize.h
> @@ -24,5 +24,3 @@
> # define __WORDSIZE32_SIZE_ULONG 1
> # define __WORDSIZE32_PTRDIFF_LONG 1
> #endif
> -
> -#define __WORDSIZE_TIME64_COMPAT32 0
> diff --git a/sysdeps/mips/bits/wordsize.h
> b/sysdeps/mips/bits/wordsize.h index d14f497895..3af04daea6 100644
> --- a/sysdeps/mips/bits/wordsize.h
> +++ b/sysdeps/mips/bits/wordsize.h
> @@ -19,12 +19,6 @@
>
> #define __WORDSIZE _MIPS_SZPTR
>
> -#if _MIPS_SIM == _ABI64
> -# define __WORDSIZE_TIME64_COMPAT32 1
> -#else
> -# define __WORDSIZE_TIME64_COMPAT32 0
> -#endif
> -
> #if __WORDSIZE == 32
> #define __WORDSIZE32_SIZE_ULONG 0
> #define __WORDSIZE32_PTRDIFF_LONG 0
> diff --git a/sysdeps/powerpc/powerpc32/bits/wordsize.h
> b/sysdeps/powerpc/powerpc32/bits/wordsize.h index
> 04ca9debf0..df1aa27244 100644 ---
> a/sysdeps/powerpc/powerpc32/bits/wordsize.h +++
> b/sysdeps/powerpc/powerpc32/bits/wordsize.h @@ -2,10 +2,8 @@
>
> #if defined __powerpc64__
> # define __WORDSIZE 64
> -# define __WORDSIZE_TIME64_COMPAT32 1
> #else
> # define __WORDSIZE 32
> -# define __WORDSIZE_TIME64_COMPAT32 0
> # define __WORDSIZE32_SIZE_ULONG 0
> # define __WORDSIZE32_PTRDIFF_LONG 0
> #endif
> diff --git a/sysdeps/powerpc/powerpc64/bits/wordsize.h
> b/sysdeps/powerpc/powerpc64/bits/wordsize.h index
> 04ca9debf0..df1aa27244 100644 ---
> a/sysdeps/powerpc/powerpc64/bits/wordsize.h +++
> b/sysdeps/powerpc/powerpc64/bits/wordsize.h @@ -2,10 +2,8 @@
>
> #if defined __powerpc64__
> # define __WORDSIZE 64
> -# define __WORDSIZE_TIME64_COMPAT32 1
> #else
> # define __WORDSIZE 32
> -# define __WORDSIZE_TIME64_COMPAT32 0
> # define __WORDSIZE32_SIZE_ULONG 0
> # define __WORDSIZE32_PTRDIFF_LONG 0
> #endif
> diff --git a/sysdeps/riscv/bits/wordsize.h
> b/sysdeps/riscv/bits/wordsize.h index faccc71828..182e3d33a6 100644
> --- a/sysdeps/riscv/bits/wordsize.h
> +++ b/sysdeps/riscv/bits/wordsize.h
> @@ -21,9 +21,3 @@
> #else
> # error unsupported ABI
> #endif
> -
> -#if __riscv_xlen == 64
> -# define __WORDSIZE_TIME64_COMPAT32 1
> -#else
> -# error "rv32i-based targets are not supported"
> -#endif
> diff --git a/sysdeps/s390/s390-32/bits/wordsize.h
> b/sysdeps/s390/s390-32/bits/wordsize.h index 129e47182b..755050861e
> 100644 --- a/sysdeps/s390/s390-32/bits/wordsize.h
> +++ b/sysdeps/s390/s390-32/bits/wordsize.h
> @@ -7,5 +7,3 @@
> # define __WORDSIZE32_SIZE_ULONG 1
> # define __WORDSIZE32_PTRDIFF_LONG 0
> #endif
> -
> -#define __WORDSIZE_TIME64_COMPAT32 0
> diff --git a/sysdeps/s390/s390-64/bits/wordsize.h
> b/sysdeps/s390/s390-64/bits/wordsize.h index 00e88b0628..01245a5b71
> 100644 --- a/sysdeps/s390/s390-64/bits/wordsize.h
> +++ b/sysdeps/s390/s390-64/bits/wordsize.h
> @@ -7,5 +7,3 @@
> # define __WORDSIZE32_SIZE_ULONG 1
> # define __WORDSIZE32_PTRDIFF_LONG 0
> #endif
> -
> -#define __WORDSIZE_TIME64_COMPAT32 0
> diff --git a/sysdeps/sparc/sparc32/bits/wordsize.h
> b/sysdeps/sparc/sparc32/bits/wordsize.h index 2f66f10d72..10b73267f0
> 100644 --- a/sysdeps/sparc/sparc32/bits/wordsize.h
> +++ b/sysdeps/sparc/sparc32/bits/wordsize.h
> @@ -2,10 +2,8 @@
>
> #if defined __arch64__ || defined __sparcv9
> # define __WORDSIZE 64
> -# define __WORDSIZE_TIME64_COMPAT32 1
> #else
> # define __WORDSIZE 32
> -# define __WORDSIZE_TIME64_COMPAT32 0
> # define __WORDSIZE32_SIZE_ULONG 0
> # define __WORDSIZE32_PTRDIFF_LONG 0
> #endif
> diff --git a/sysdeps/sparc/sparc64/bits/wordsize.h
> b/sysdeps/sparc/sparc64/bits/wordsize.h index 2f66f10d72..10b73267f0
> 100644 --- a/sysdeps/sparc/sparc64/bits/wordsize.h
> +++ b/sysdeps/sparc/sparc64/bits/wordsize.h
> @@ -2,10 +2,8 @@
>
> #if defined __arch64__ || defined __sparcv9
> # define __WORDSIZE 64
> -# define __WORDSIZE_TIME64_COMPAT32 1
> #else
> # define __WORDSIZE 32
> -# define __WORDSIZE_TIME64_COMPAT32 0
> # define __WORDSIZE32_SIZE_ULONG 0
> # define __WORDSIZE32_PTRDIFF_LONG 0
> #endif
> diff --git a/sysdeps/unix/sysv/linux/alpha/bits/wordsize.h
> b/sysdeps/unix/sysv/linux/alpha/bits/wordsize.h index
> 74289c244a..6d955a9f27 100644 ---
> a/sysdeps/unix/sysv/linux/alpha/bits/wordsize.h +++
> b/sysdeps/unix/sysv/linux/alpha/bits/wordsize.h @@ -16,4 +16,3 @@
> <https://www.gnu.org/licenses/>. */
>
> #define __WORDSIZE 64
> -#define __WORDSIZE_TIME64_COMPAT32 0
> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h
> b/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h index
> 04ca9debf0..df1aa27244 100644 ---
> a/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h +++
> b/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h @@ -2,10 +2,8 @@
>
> #if defined __powerpc64__
> # define __WORDSIZE 64
> -# define __WORDSIZE_TIME64_COMPAT32 1
> #else
> # define __WORDSIZE 32
> -# define __WORDSIZE_TIME64_COMPAT32 0
> # define __WORDSIZE32_SIZE_ULONG 0
> # define __WORDSIZE32_PTRDIFF_LONG 0
> #endif
> diff --git a/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h
> b/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h index
> 7562875ee2..10b73267f0 100644 ---
> a/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h +++
> b/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h @@ -2,10 +2,8 @@
>
> #if defined __arch64__ || defined __sparcv9
> # define __WORDSIZE 64
> -# define __WORDSIZE_TIME64_COMPAT32 1
> #else
> # define __WORDSIZE 32
> # define __WORDSIZE32_SIZE_ULONG 0
> # define __WORDSIZE32_PTRDIFF_LONG 0
> -# define __WORDSIZE_TIME64_COMPAT32 0
> #endif
> diff --git a/sysdeps/wordsize-32/bits/wordsize.h
> b/sysdeps/wordsize-32/bits/wordsize.h index 759906a08d..869a7ab2aa
> 100644 --- a/sysdeps/wordsize-32/bits/wordsize.h
> +++ b/sysdeps/wordsize-32/bits/wordsize.h
> @@ -16,6 +16,5 @@
> <https://www.gnu.org/licenses/>. */
>
> #define __WORDSIZE 32
> -#define __WORDSIZE_TIME64_COMPAT32 0
> #define __WORDSIZE32_SIZE_ULONG 0
> #define __WORDSIZE32_PTRDIFF_LONG 0
> diff --git a/sysdeps/wordsize-64/bits/wordsize.h
> b/sysdeps/wordsize-64/bits/wordsize.h index 44b9725814..8613a6cb3c
> 100644 --- a/sysdeps/wordsize-64/bits/wordsize.h
> +++ b/sysdeps/wordsize-64/bits/wordsize.h
> @@ -16,4 +16,3 @@
> <https://www.gnu.org/licenses/>. */
>
> #define __WORDSIZE 64
> -#define __WORDSIZE_TIME64_COMPAT32 0
> diff --git a/sysdeps/x86/bits/wordsize.h b/sysdeps/x86/bits/wordsize.h
> index 70f652bca1..cf250cc6df 100644
> --- a/sysdeps/x86/bits/wordsize.h
> +++ b/sysdeps/x86/bits/wordsize.h
> @@ -9,9 +9,6 @@
> #endif
>
> #ifdef __x86_64__
> -# define __WORDSIZE_TIME64_COMPAT32 1
> /* Both x86-64 and x32 use the 64-bit system call interface. */
> # define __SYSCALL_WORDSIZE 64
> -#else
> -# define __WORDSIZE_TIME64_COMPAT32 0
> #endif
Reviewed-by: Lukasz Majewski <lukma@denx.de>
As those patches are available for review on the mailing list since the
end of July, and nobody but me had any comments, will you find soon some
time to pull them to -master?
In general you made generic use of the s390-32 working code, so IMHO,
this patch series shouldn't do much harm.
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-10-22 9:31 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-29 20:51 [PATCH 1/5] login: Consolidate utmp and utmpx headers Adhemerval Zanella via Libc-alpha
2020-07-29 20:51 ` [PATCH 2/5] login: Move gnu utmpx to default implementaion Adhemerval Zanella via Libc-alpha
2020-10-22 8:15 ` Lukasz Majewski
2020-10-22 9:16 ` Andreas Schwab
2020-07-29 20:51 ` [PATCH 3/5] login: Add 64-bit time support Adhemerval Zanella via Libc-alpha
2020-07-29 21:17 ` Joseph Myers
2020-07-30 12:34 ` Adhemerval Zanella via Libc-alpha
2020-08-02 19:02 ` Maciej W. Rozycki via Libc-alpha
2020-08-02 22:05 ` Adhemerval Zanella via Libc-alpha
2020-10-22 9:16 ` Lukasz Majewski
2020-07-29 20:51 ` [PATCH 4/5] login: User 64-bit time on struct lastlog Adhemerval Zanella via Libc-alpha
2020-07-29 21:04 ` Andreas Schwab
2020-07-29 21:14 ` Andreas Schwab
2020-07-30 12:39 ` Adhemerval Zanella via Libc-alpha
2020-07-30 16:19 ` Florian Weimer via Libc-alpha
2020-07-30 18:54 ` Joseph Myers
2020-07-30 21:53 ` Adhemerval Zanella via Libc-alpha
2020-07-31 0:31 ` Joseph Myers
2020-07-30 21:46 ` Adhemerval Zanella via Libc-alpha
2020-10-22 9:25 ` Lukasz Majewski
2020-07-29 20:51 ` [PATCH 5/5] Remove __WORDSIZE_TIME64_COMPAT32 Adhemerval Zanella via Libc-alpha
2020-10-22 9:31 ` Lukasz Majewski [this message]
2020-07-29 21:08 ` [PATCH 1/5] login: Consolidate utmp and utmpx headers Joseph Myers
2020-07-30 12:36 ` Adhemerval Zanella via Libc-alpha
2020-10-22 8:06 ` Lukasz Majewski
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
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201022113127.407946d6@jawa \
--to=lukma@denx.de \
--cc=adhemerval.zanella@linaro.org \
--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).