Define wordsize.h macros everywhere
Commit Message
This patch is based on an earlier patch Yury Norov sent out.
That patch is at:
https://sourceware.org/ml/libc-alpha/2016-08/msg00840.html
This patch defines __WORDSIZE32_SIZE_ULONG, __WORDSIZE_TIME64_COMPAT32,
and __SYSCALL_WORDSIZE in all the wordsize.h files so that the values
of those macros can be checked instead of checking to see if they
are defined or not. This matches the current glibc macro usage
preference as I understand it. The patch also introduces a new macro,
__WORDSIZE32_PTRDIFF_LONG, that is needed by the aarch64 ILP32 ABI that
is in the works. This macro doesn't technically have to be part of
this patch since the rest of the ILP32 work is not in yet but since it
touches the same wordsize.h files that the other macros touch it seems
to make sense to include it in this patch. That way we will not have
to modify these files again as part of the aarch64 ILP patches. I also
updated the comments that Yury had added to bits/wordsize.h in response
to earlier feedback.
I have tested this patch on x86_64 in 32, x32 and 64 bit modes and on
aarch64 with no regressions.
OK to checkin?
Steve Ellcey
sellcey@caviiumnetworks.com
2016-10-24 Yury Norov <ynorov@caviumnetworks.com>
Steve Ellcey <sellcey@caviumnetworks.com>
* bits/wordsize.h: Add documentation.
* sysdeps/aarch64/bits/wordsize.h : New file
* sysdeps/generic/stdint.h (PTRDIFF_MIN, PTRDIFF_MAX): Update
definitions.
(SIZE_MAX): Change ifdef to if in __WORDSIZE32_SIZE_ULONG check.
* sysdeps/gnu/bits/utmp.h (__WORDSIZE_TIME64_COMPAT32): Check
with #if instead of #ifdef.
* sysdeps/gnu/bits/utmpx.h (__WORDSIZE_TIME64_COMPAT32): Ditto.
* sysdeps/unix/sysv/linux/bits/statvfs.h (_STATVFSBUF_F_UNUSED):
Change check to assume __SYSCALL_WORDSIZE is set.
* sysdeps/mips/bits/wordsize.h (__SYSCALL_WORDSIZE,
__WORDSIZE32_SIZE_ULONG, __WORDSIZE32_PTRDIFF_LONG,
__WORDSIZE_TIME64_COMPAT32): Add or change defines.
* 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.
Comments
On Wed, 26 Oct 2016, Steve Ellcey wrote:
> diff --git a/bits/wordsize.h b/bits/wordsize.h
> index 9ef0e85..2ebecd6 100644
> --- a/bits/wordsize.h
> +++ b/bits/wordsize.h
> @@ -1 +1,28 @@
> #error "This file must be written based on the data type sizes of the target"
> +
> +/* The following entries are a template for what defines should be in the
> + wordsize.h header file for a target. */
> +
> +/* Bits per word (size of CPU register). */
> +#define __WORDSIZE
That's not an accurate description. It's definitely the size of long int
and pointers, even if registers are larger.
> +/* Set to the size of the f_fsid field in the statvfs and statvfs64 structs.
> + In most cases this is the same as __WORDSIZE but some 32 bit hosts may set
> + it to 64. */
> +#define __SYSCALL_WORDSIZE
If it's so specific to those syscalls, it doesn't belong in
bits/wordsize.h but in some header specific to those syscalls. Even the
*concept* of syscalls doesn't belong in bits/wordsize.h (remember there
are non-syscall ports such as Hurd).
> +/* Set to 1 if ssize_t is type 'unsigned long' instead of type 'unsigned int'
> + so that SIZE_MAX is defined as an unsigned long constant instead of an
> + unsigned int constant. Set to 0 if ssize_t is 'unsigned int'. */
> +#define __WORDSIZE32_SIZE_ULONG
Is this about ssize_t as the comment says (twice), or size_t?
> +/* Set to 1 if ptrdiff_t is type 'long' instead of type 'int' so that
> + PTRDIFF_MIN and PTRDIFF_MAX are defined as long constants instead of
> + int constants. Set to 0 if ptrdiff_t is type 'int'. */
> +#define __WORDSIZE32_PTRDIFF_LONG
For both these macros I think consensus is as Andreas said in
<https://sourceware.org/ml/libc-alpha/2016-07/msg00251.html> and
<https://sourceware.org/ml/libc-alpha/2016-07/msg00267.html>.
That is, they should only be defined if __WORDSIZE == 32. They should be
tested with #if not #ifdef, but all such tests should only be evaluated if
__WORDSIZE == 32, so that we get -Wundef errors if any such test gets
evaluated with __WORDSIZE == 64.
So the comments specifying the semantics of those macros should say that
they are only defined or used if __WORDSIZE == 32, and the headers should
only define them under that condition.
@@ -1 +1,28 @@
 #error "This file must be written based on the data type sizes of the target"
+
+/* The following entries are a template for what defines should be in the
+   wordsize.h header file for a target.  */
+
+/* Bits per word (size of CPU register).  */
+#define __WORDSIZE
+
+/* Set to the size of the f_fsid field in the statvfs and statvfs64 structs.
+Â Â Â In most cases this is the same as __WORDSIZE but some 32 bit hosts may set
+   it to 64.  */
+#define __SYSCALL_WORDSIZE
+
+/* Set to 1 if ssize_t is type 'unsigned long' instead of type 'unsigned int'
+Â Â Â so that SIZE_MAX is defined as an unsigned long constant instead of an
+   unsigned int constant.  Set to 0 if ssize_t is 'unsigned int'.  */
+#define __WORDSIZE32_SIZE_ULONG
+
+/* Set to 1 if ptrdiff_t is type 'long' instead of type 'int' so that
+Â Â Â PTRDIFF_MIN and PTRDIFF_MAX are defined as long constants instead of
+   int constants.  Set to 0 if ptrdiff_t is type 'int'.  */
+#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
@@ -0,0 +1,31 @@
+/* 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
+   <<a rel="nofollow" href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>.  */
+
+#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 __SYSCALL_WORDSIZE __WORDSIZE
+#define __WORDSIZE_TIME64_COMPAT32 0
@@ -249,8 +249,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'.  */
@@ -261,7 +266,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
   {
@@ -17,7 +17,13 @@
Â
 #include <sgidefs.h>
Â
-#define __WORDSIZE _MIPS_SZPTR
+#define __WORDSIZE _MIPS_SZPTR
+#define __SYSCALL_WORDSIZE __WORDSIZE
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
+
 #if _MIPS_SIM == _ABI64
 # define __WORDSIZE_TIME64_COMPAT32 1
+#else
+# define __WORDSIZE_TIME64_COMPAT32 0
 #endif
@@ -5,4 +5,9 @@
 # define __WORDSIZE_TIME64_COMPAT32 1
 #else
 # define __WORDSIZE 32
+# define __WORDSIZE_TIME64_COMPAT32 0
 #endif
+
+#define __SYSCALL_WORDSIZE __WORDSIZE
+#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 __SYSCALL_WORDSIZE __WORDSIZE
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
@@ -2,11 +2,16 @@
Â
 #if defined __s390x__
 # define __WORDSIZE 64
+# define __WORDSIZE32_SIZE_ULONGÂ Â Â Â Â Â Â 0
 #else
 # define __WORDSIZE 32
 # define __WORDSIZE32_SIZE_ULONG       1
 #endif
Â
+#define __SYSCALL_WORDSIZE __WORDSIZE
+#define __WORDSIZE32_PTRDIFF_LONGÂ Â Â Â Â Â 0
+#define __WORDSIZE_TIME64_COMPAT32Â Â Â Â Â 0
+
 #if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL
Â
 /* Signal that we didn't used to have a `long double'. The changes all
@@ -2,11 +2,16 @@
Â
 #if defined __s390x__
 # define __WORDSIZE 64
+# define __WORDSIZE32_SIZE_ULONGÂ Â Â Â Â Â Â 0
 #else
 # define __WORDSIZE 32
 # define __WORDSIZE32_SIZE_ULONG       1
 #endif
Â
+#define __SYSCALL_WORDSIZE __WORDSIZE
+#define __WORDSIZE32_PTRDIFF_LONGÂ Â Â Â Â Â 0
+#define __WORDSIZE_TIME64_COMPAT32Â Â Â Â Â 0
+
 #if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL
Â
 /* Signal that we didn't used to have a `long double'. The changes all
@@ -5,4 +5,9 @@
 # define __WORDSIZE_TIME64_COMPAT32 1
 #else
 # define __WORDSIZE 32
+# define __WORDSIZE_TIME64_COMPAT32 0
 #endif
+
+#define __SYSCALL_WORDSIZE __WORDSIZE
+#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 __SYSCALL_WORDSIZE __WORDSIZE
+#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 __SYSCALL_WORDSIZE __WORDSIZE
+#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 __WORDSIZE 32
+#define __SYSCALL_WORDSIZE __WORDSIZE
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
+#define __WORDSIZE_TIME64_COMPAT32 0
@@ -16,6 +16,10 @@
    <http://www.gnu.org/licenses/>.  */
Â
 #define __WORDSIZE 64
+#define __SYSCALL_WORDSIZE __WORDSIZE
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
+#define __WORDSIZE_TIME64_COMPAT32 0
Â
 #if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL
Â
@@ -21,8 +21,7 @@
Â
 #include <bits/types.h>  /* For __fsblkcnt_t and __fsfilcnt_t.  */
Â
-#if (__WORDSIZE == 32 \
-Â Â Â Â Â && (!defined __SYSCALL_WORDSIZE || __SYSCALL_WORDSIZE == 32))
+#if (__WORDSIZE == 32 && __SYSCALL_WORDSIZE == 32)
 #define _STATVFSBUF_F_UNUSED
 #endif
Â
@@ -5,8 +5,13 @@
 # define __WORDSIZE_TIME64_COMPAT32 1
 #else
 # define __WORDSIZE 32
+# define __WORDSIZE_TIME64_COMPAT32 0
 #endif
Â
+#define __SYSCALL_WORDSIZE __WORDSIZE
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
+
 #if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL
Â
 /* Signal the glibc ABI didn't used to have a `long double'.
@@ -6,6 +6,11 @@
 # define __WORDSIZE 32
 #endif
Â
+#define __SYSCALL_WORDSIZE __WORDSIZE
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
+
 #if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL
Â
 # if __WORDSIZE == 32
@@ -15,4 +15,8 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
Â
-#define __WORDSIZE 32
+#define __WORDSIZE 32
+#define __SYSCALL_WORDSIZE __WORDSIZE
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
+#define __WORDSIZE_TIME64_COMPAT32 0
@@ -15,4 +15,8 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
Â
-#define __WORDSIZE 64
+#define __WORDSIZE 64
+#define __SYSCALL_WORDSIZE __WORDSIZE
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
+#define __WORDSIZE_TIME64_COMPAT32 0
@@ -6,8 +6,14 @@
 # define __WORDSIZE 32
 #endif
Â
+#define __WORDSIZE32_SIZE_ULONG 0
+#define __WORDSIZE32_PTRDIFF_LONG 0
+
 #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
+# define __SYSCALL_WORDSIZE 32
 #endif