[v2] all: #define wordsize-related macros everywhere
Commit Message
__WORDSIZE_TIME64_COMPAT32 and __WORDSIZE32_SIZE_ULONG should be defined to 0
but it's not defined at all for many targets.
__WORDSIZE32_PTRDIFF_LONG is introduced for aarch64/ilp32, and defined
for all other ports as well.
This patch is the part of aarch64/ilp32 work but it can be applied
separately as it fixes inconsistency in GLIBC.
v2:
- added __WORDSIZE_TIME64_COMPAT32;
- added documentation;
- removed newlines at the end of files.
* sysdeps/aarch64/bits/wordsize.h : New file
(__WORDSIZE32_SIZE_ULONG): Define.
(__WORDSIZE_TIME64_COMPAT32): Define.
(__WORDSIZE32_PTRDIFF_LONG): New define.
* sysdeps/mips/bits/wordsize.h: Likewise.
* sysdeps/powerpc/powerpc32/bits/wordsize.h: Likewise.
* sysdeps/powerpc/powerpc64/bits/wordsize.h: Likewise.
* sysdeps/s390/s390-32/bits/wordsize.h: Likewise.
* sysdeps/s390/s390-64/bits/wordsize.h: Likewise.
* sysdeps/sparc/sparc32/bits/wordsize.h: Likewise.
* sysdeps/sparc/sparc64/bits/wordsize.h: Likewise.
* sysdeps/tile/tilegx/bits/wordsize.h: Likewise.
* sysdeps/tile/tilepro/bits/wordsize.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/wordsize.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/wordsize.h: Likewise.
* sysdeps/wordsize-32/bits/wordsize.h: Likewise.
* sysdeps/wordsize-64/bits/wordsize.h: Likewise.
* sysdeps/x86/bits/wordsize.h: Likewise.
* sysdeps/generic/stdint.h: Use #if instead of #ifdef for that macros.
* sysdeps/gnu/bits/utmp.h: Likewise.
* sysdeps/gnu/bits/utmpx.h: Likewise.
* bits/wordsize.h: Add documentation.
Signed-off-by: Andrew Pinski <apinski@cavium.com>
Signed-off-by: Yury Norov <ynorov@caviumnetworks.com>
---
bits/wordsize.h | 9 ++++++++
sysdeps/aarch64/bits/wordsize.h | 30 +++++++++++++++++++++++++
sysdeps/generic/stdint.h | 11 ++++++---
sysdeps/gnu/bits/utmp.h | 4 ++--
sysdeps/gnu/bits/utmpx.h | 2 +-
sysdeps/mips/bits/wordsize.h | 5 +++++
sysdeps/powerpc/powerpc32/bits/wordsize.h | 4 ++++
sysdeps/powerpc/powerpc64/bits/wordsize.h | 4 ++++
sysdeps/s390/s390-32/bits/wordsize.h | 6 ++++-
sysdeps/s390/s390-64/bits/wordsize.h | 6 ++++-
sysdeps/sparc/sparc32/bits/wordsize.h | 4 ++++
sysdeps/sparc/sparc64/bits/wordsize.h | 4 ++++
sysdeps/tile/tilegx/bits/wordsize.h | 5 +++++
sysdeps/tile/tilepro/bits/wordsize.h | 4 ++++
sysdeps/unix/sysv/linux/alpha/bits/wordsize.h | 4 ++++
sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h | 4 ++++
sysdeps/unix/sysv/linux/sparc/bits/wordsize.h | 4 ++++
sysdeps/wordsize-32/bits/wordsize.h | 4 ++++
sysdeps/wordsize-64/bits/wordsize.h | 4 ++++
sysdeps/x86/bits/wordsize.h | 5 +++++
20 files changed, 115 insertions(+), 8 deletions(-)
create mode 100644 sysdeps/aarch64/bits/wordsize.h
Comments
Yury Norov <ynorov@caviumnetworks.com> writes:
> +#ifdef __LP64__
> +# define __WORDSIZE 64
> +# define __WORDSIZE32_SIZE_ULONG 0
> +# define __WORDSIZE32_PTRDIFF_LONG 0
> +#else
> +# define __WORDSIZE 32
> +# define __WORDSIZE32_SIZE_ULONG 1
> +# define __WORDSIZE32_PTRDIFF_LONG 1
> +#endif
Given that __WORDSIZE32_* are meaningless with __WORDSIZE == 64 and
should not be used in that case at all they should not be defined then
in the first place.
Andreas.
On Mon, Jul 11, 2016 at 09:10:50AM +0200, Andreas Schwab wrote:
> Yury Norov <ynorov@caviumnetworks.com> writes:
>
> > +#ifdef __LP64__
> > +# define __WORDSIZE 64
> > +# define __WORDSIZE32_SIZE_ULONG 0
> > +# define __WORDSIZE32_PTRDIFF_LONG 0
> > +#else
> > +# define __WORDSIZE 32
> > +# define __WORDSIZE32_SIZE_ULONG 1
> > +# define __WORDSIZE32_PTRDIFF_LONG 1
> > +#endif
>
> Given that __WORDSIZE32_* are meaningless with __WORDSIZE == 64 and
> should not be used in that case at all they should not be defined then
> in the first place.
>
> Andreas.
>
> --
> Andreas Schwab, SUSE Labs, schwab@suse.de
> GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
> "And now for something completely different."
Yes they are meaningless. But that's what Joseph wants: don't use
#ifdef, but just #if instead. If so, to be consistent we should define
it even if it is useless. We cannot predict how they will be used in
future, and if not defined they may cause build fail. Or I missed something?
Yury.
Yury Norov <ynorov@caviumnetworks.com> writes:
> Yes they are meaningless. But that's what Joseph wants: don't use
> #ifdef, but just #if instead. If so, to be consistent we should define
> it even if it is useless. We cannot predict how they will be used in
> future, and if not defined they may cause build fail. Or I missed something?
If __WORDSIZE32_* is used when __WORDSIZE == 64 we have a bug.
Andreas.
On 07/11/2016 05:50 PM, Andreas Schwab wrote:
> Yury Norov <ynorov@caviumnetworks.com> writes:
>
>> Yes they are meaningless. But that's what Joseph wants: don't use
>> #ifdef, but just #if instead. If so, to be consistent we should define
>> it even if it is useless. We cannot predict how they will be used in
>> future, and if not defined they may cause build fail. Or I missed something?
>
> If __WORDSIZE32_* is used when __WORDSIZE == 64 we have a bug.
Agreed, it's perfectly reasonable to fail compilation under these
circumstances.
Thanks,
Florian
@@ -1 +1,10 @@
#error "This file must be written based on the data type sizes of the target"
+
+#define __WORDSIZE /* Bits ber word (size of CPU register. */
+#define __WORDSIZE32_SIZE_ULONG /* Set to 1 if port is working in 32-bit mode
+ on 64-bit CPU to define SIZE_MAX correctly. */
+#define __WORDSIZE32_PTRDIFF_LONG /* Likewize for PTRDIFF_MIN and PTRDIFF_MAX. */
+#define __WORDSIZE_TIME64_COMPAT32 /* Set to 1 to force time types to be 32-bit
+ in struct lastlog and struct utmp{,x}
+ if your 64-bit port should be compatible to
+ 32-bit old ports. */
new file mode 100644
@@ -0,0 +1,30 @@
+/* Determine the wordsize from the preprocessor defines.
+
+ Copyright (C) 2016 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifdef __LP64__
+# define __WORDSIZE 64
+# define __WORDSIZE32_SIZE_ULONG 0
+# define __WORDSIZE32_PTRDIFF_LONG 0
+#else
+# define __WORDSIZE 32
+# define __WORDSIZE32_SIZE_ULONG 1
+# define __WORDSIZE32_PTRDIFF_LONG 1
+#endif
+
+#define __WORDSIZE_TIME64_COMPAT32 0
@@ -248,8 +248,13 @@ typedef unsigned long long int uintmax_t;
# define PTRDIFF_MIN (-9223372036854775807L-1)
# define PTRDIFF_MAX (9223372036854775807L)
# else
-# define PTRDIFF_MIN (-2147483647-1)
-# define PTRDIFF_MAX (2147483647)
+# if __WORDSIZE32_PTRDIFF_LONG
+# define PTRDIFF_MIN (-2147483647L-1)
+# define PTRDIFF_MAX (2147483647L)
+# else
+# define PTRDIFF_MIN (-2147483647-1)
+# define PTRDIFF_MAX (2147483647)
+# endif
# endif
/* Limits of `sig_atomic_t'. */
@@ -260,7 +265,7 @@ typedef unsigned long long int uintmax_t;
# if __WORDSIZE == 64
# define SIZE_MAX (18446744073709551615UL)
# else
-# ifdef __WORDSIZE32_SIZE_ULONG
+# if __WORDSIZE32_SIZE_ULONG
# define SIZE_MAX (4294967295UL)
# else
# define SIZE_MAX (4294967295U)
@@ -35,7 +35,7 @@
previous logins. */
struct lastlog
{
-#ifdef __WORDSIZE_TIME64_COMPAT32
+#if __WORDSIZE_TIME64_COMPAT32
int32_t ll_time;
#else
__time_t ll_time;
@@ -68,7 +68,7 @@ struct utmp
/* The ut_session and ut_tv fields must be the same size when compiled
32- and 64-bit. This allows data files and shared memory to be
shared between 32- and 64-bit applications. */
-#ifdef __WORDSIZE_TIME64_COMPAT32
+#if __WORDSIZE_TIME64_COMPAT32
int32_t ut_session; /* Session ID, used for windowing. */
struct
{
@@ -66,7 +66,7 @@ struct utmpx
/* The fields ut_session and ut_tv must be the same size when compiled
32- and 64-bit. This allows files and shared memory to be shared
between 32- and 64-bit applications. */
-#ifdef __WORDSIZE_TIME64_COMPAT32
+#if __WORDSIZE_TIME64_COMPAT32
__int32_t ut_session; /* Session ID, used for windowing. */
struct
{
@@ -20,4 +20,9 @@
#define __WORDSIZE _MIPS_SZPTR
#if _MIPS_SIM == _ABI64
# define __WORDSIZE_TIME64_COMPAT32 1
+#else
+# define __WORDSIZE_TIME64_COMPAT32 0
#endif
+
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
@@ -5,4 +5,8 @@
# define __WORDSIZE_TIME64_COMPAT32 1
#else
# define __WORDSIZE 32
+# define __WORDSIZE_TIME64_COMPAT32 0
#endif
+
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
@@ -5,4 +5,8 @@
# define __WORDSIZE_TIME64_COMPAT32 1
#else
# define __WORDSIZE 32
+# define __WORDSIZE_TIME64_COMPAT32 0
#endif
+
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
@@ -2,9 +2,10 @@
#if defined __s390x__
# define __WORDSIZE 64
+# define __WORDSIZE32_SIZE_ULONG 0
#else
# define __WORDSIZE 32
-# define __WORDSIZE32_SIZE_ULONG 1
+# define __WORDSIZE32_SIZE_ULONG 1
#endif
#if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL
@@ -17,3 +18,6 @@
# define __NO_LONG_DOUBLE_MATH 1
# endif
#endif
+
+#define __WORDSIZE32_PTRDIFF_LONG 0
+#define __WORDSIZE_TIME64_COMPAT32 0
@@ -2,9 +2,10 @@
#if defined __s390x__
# define __WORDSIZE 64
+# define __WORDSIZE32_SIZE_ULONG 0
#else
# define __WORDSIZE 32
-# define __WORDSIZE32_SIZE_ULONG 1
+# define __WORDSIZE32_SIZE_ULONG 1
#endif
#if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL
@@ -17,3 +18,6 @@
# define __NO_LONG_DOUBLE_MATH 1
# endif
#endif
+
+#define __WORDSIZE32_PTRDIFF_LONG 0
+#define __WORDSIZE_TIME64_COMPAT32 0
@@ -5,4 +5,8 @@
# define __WORDSIZE_TIME64_COMPAT32 1
#else
# define __WORDSIZE 32
+# define __WORDSIZE_TIME64_COMPAT32 0
#endif
+
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
@@ -5,4 +5,8 @@
# define __WORDSIZE_TIME64_COMPAT32 1
#else
# define __WORDSIZE 32
+# define __WORDSIZE_TIME64_COMPAT32 0
#endif
+
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
@@ -5,4 +5,9 @@
# define __WORDSIZE_TIME64_COMPAT32 1
#else
# define __WORDSIZE 32
+# define __WORDSIZE_TIME64_COMPAT32 0
#endif
+
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
+
@@ -1,3 +1,7 @@
/* Determine the wordsize from the preprocessor defines. */
#define __WORDSIZE 32
+
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
+#define __WORDSIZE_TIME64_COMPAT32 0
@@ -27,3 +27,7 @@
# define __NO_LONG_DOUBLE_MATH 1
# endif
#endif
+
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
+#define __WORDSIZE_TIME64_COMPAT32 0
@@ -5,6 +5,7 @@
# define __WORDSIZE_TIME64_COMPAT32 1
#else
# define __WORDSIZE 32
+# define __WORDSIZE_TIME64_COMPAT32 0
#endif
#if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL
@@ -17,3 +18,6 @@
# define __NO_LONG_DOUBLE_MATH 1
# endif
#endif
+
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
@@ -18,3 +18,7 @@
# endif
# endif
#endif
+
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
+#define __WORDSIZE_TIME64_COMPAT32 0
@@ -16,3 +16,7 @@
<http://www.gnu.org/licenses/>. */
#define __WORDSIZE 32
+
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
+#define __WORDSIZE_TIME64_COMPAT32 0
@@ -16,3 +16,7 @@
<http://www.gnu.org/licenses/>. */
#define __WORDSIZE 64
+
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
+#define __WORDSIZE_TIME64_COMPAT32 0
@@ -10,4 +10,9 @@
# 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
+
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0