Y2038: provide size of default time_t for target architecture

    To determine whether the default time_t interfaces are 32-bit
    and so need conversions, or are 64-bit and so are compatible
    with the internal 64-bit type without conversions, a macro
    giving the size of the  default time_t is also required.
    This macro is called __TIMESIZE.

    This macro can then be used instead of __WORDSIZE in msq-pad.h
    and shm-pad.h files, which in turn allows removing their x86
    variants, and in sem-pad.h files but keeping the x86 variant.

    This patch was tested by running 'make check' on branch master
    then applying this patch and running 'make check' again, and
    checking that both 'make check' yield identical results.
    This was done on x86_64-linux-gnu and i686-linux-gnu.

	* bits/timesize.h: New file.
	* stdlib/Makefile (headers): Add bits/timesize.h.
	* sysdeps/unix/sysv/linux/bits/msq-pad.h
	(__MSQ_PAD_AFTER_TIME): Use __TIMESIZE instead of __WORDSIZE.
	* sysdeps/unix/sysv/linux/bits/sem-pad.h
	(__SEM_PAD_AFTER_TIME): Likewise.
	* sysdeps/unix/sysv/linux/bits/shm-pad.h
	(__SHM_PAD_AFTER_TIME): Likewise.
	* sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h
	(__MSQ_PAD_BEFORE_TIME): Likewise.
	* sysdeps/unix/sysv/linux/hppa/bits/sem-pad.h
	(__SEM_PAD_BEFORE_TIME): Likewise.
	* sysdeps/unix/sysv/linux/hppa/bits/shm-pad.h
	(__SHM_PAD_BEFORE_TIME, __SHM_PAD_BETWEEN_TIME_AND_SEGSZ): Likewise.
	* sysdeps/unix/sysv/linux/mips/bits/msq-pad.h
        (__MSQ_PAD_AFTER_TIME, __MSQ_PAD_BEFORE_TIME): Likewise.
        * sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h
        (__MSQ_PAD_BEFORE_TIME): Likewise.
	* sysdeps/unix/sysv/linux/powerpc/bits/sem-pad.h
	(__SEM_PAD_BEFORE_TIME): Likewise.
	* sysdeps/unix/sysv/linux/powerpc/bits/shm-pad.h
	(__SHM_PAD_BEFORE_TIME, __SHM_PAD_BETWEEN_TIME_AND_SEGSZ): Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h
	(__MSQ_PAD_BEFORE_TIME): Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/sem-pad.h
	(__SEM_PAD_BEFORE_TIME): Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/shm-pad.h
	(__SHM_PAD_BEFORE_TIME): Likewise.
	* sysdeps/unix/sysv/linux/x86/bits/msq-pad.h: Delete file.
	* sysdeps/unix/sysv/linux/x86/bits/shm-pad.h: Likewise.
	* sysdeps/unix/sysv/linux/x86/bits/timesize.h: New file.

diff --git a/ChangeLog b/ChangeLog
index cda75db202b269acb46992fa9af97b515b634f58..9b44e8de767bd9c48cbac7b9fba1006b5cbaf40f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2018-10-24  Albert ARIBAUD <albert.aribaud@3adev.fr>
+
+       * bits/timesize.h: New file.
+       * stdlib/Makefile (headers): Add bits/timesize.h.
+       * sysdeps/unix/sysv/linux/bits/msq-pad.h
+       (__MSQ_PAD_AFTER_TIME): Use __TIMESIZE instead of __WORDSIZE.
+       * sysdeps/unix/sysv/linux/bits/sem-pad.h
+       (__SEM_PAD_AFTER_TIME): Likewise.
+       * sysdeps/unix/sysv/linux/bits/shm-pad.h
+       (__SHM_PAD_AFTER_TIME): Likewise.
+       * sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h
+       (__MSQ_PAD_BEFORE_TIME): Likewise.
+       * sysdeps/unix/sysv/linux/hppa/bits/sem-pad.h
+       (__SEM_PAD_BEFORE_TIME): Likewise.
+       * sysdeps/unix/sysv/linux/hppa/bits/shm-pad.h
+       (__SHM_PAD_BEFORE_TIME, __SHM_PAD_BETWEEN_TIME_AND_SEGSZ): Likewise.
+       * sysdeps/unix/sysv/linux/mips/bits/msq-pad.h
+        (__MSQ_PAD_AFTER_TIME, __MSQ_PAD_BEFORE_TIME): Likewise.
+        * sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h
+        (__MSQ_PAD_BEFORE_TIME): Likewise.
+       * sysdeps/unix/sysv/linux/powerpc/bits/sem-pad.h
+       (__SEM_PAD_BEFORE_TIME): Likewise.
+       * sysdeps/unix/sysv/linux/powerpc/bits/shm-pad.h
+       (__SHM_PAD_BEFORE_TIME, __SHM_PAD_BETWEEN_TIME_AND_SEGSZ): Likewise.
+       * sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h
+       (__MSQ_PAD_BEFORE_TIME): Likewise.
+       * sysdeps/unix/sysv/linux/sparc/bits/sem-pad.h
+       (__SEM_PAD_BEFORE_TIME): Likewise.
+       * sysdeps/unix/sysv/linux/sparc/bits/shm-pad.h
+       (__SHM_PAD_BEFORE_TIME): Likewise.
+       * sysdeps/unix/sysv/linux/x86/bits/msq-pad.h: Delete file.
+       * sysdeps/unix/sysv/linux/x86/bits/shm-pad.h: Likewise.
+       * sysdeps/unix/sysv/linux/x86/bits/timesize.h: New file.
+
 2018-10-24  H.J. Lu  <hongjiu.lu@intel.com>
 
        * benchtests/Makefile (CPPFLAGS-nonlib): Add -DUSE_RDTSCP if

diff --git a/sysdeps/unix/sysv/linux/x86/bits/shm-pad.h b/bits/timesize.h
similarity index 68%
rename from sysdeps/unix/sysv/linux/x86/bits/shm-pad.h
rename to bits/timesize.h
index 277a70fe6c291b52c61063a251db61a29f946218..cc47ff165fc4187ca2f7cb199fd1ca233a665e61 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86/bits/shm-pad.h
+++ b/bits/timesize.h
@@ -1,4 +1,4 @@
-/* Define where padding goes in struct shmid_ds.  x86 version.
+/* Bit size of the time_t type at glibc build time, general case.
    Copyright (C) 2018 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -16,15 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef _SYS_SHM_H
-# error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
-#endif
+#include <bits/wordsize.h>
 
-#ifdef __x86_64__
-# define __SHM_PAD_AFTER_TIME 0
-#else
-# define __SHM_PAD_AFTER_TIME 1
-#endif
-#define __SHM_PAD_BEFORE_TIME 0
-#define __SHM_SEGSZ_AFTER_TIME 0
-#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ 0
+/* Size in bits of the 'time_t' type of the default ABI.  */
+#define __TIMESIZE     __WORDSIZE

diff --git a/stdlib/Makefile b/stdlib/Makefile
index 01194bbf7cc968510b993a461f4cb29bb2829716..1773a341b5999118b0dfb758e97984877a3b63a8 100644 (file)
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -24,7 +24,7 @@ include ../Makeconfig
 
 headers        := stdlib.h bits/stdlib.h bits/stdlib-ldbl.h bits/stdlib-float.h      \
           monetary.h bits/monetary-ldbl.h                                    \
-          inttypes.h stdint.h bits/wordsize.h                                \
+          inttypes.h stdint.h bits/wordsize.h bits/timesize.h                \
           errno.h sys/errno.h bits/errno.h bits/types/error_t.h              \
           ucontext.h sys/ucontext.h bits/indirect-return.h                   \
           alloca.h fmtmsg.h                                                  \

diff --git a/sysdeps/unix/sysv/linux/bits/msq-pad.h b/sysdeps/unix/sysv/linux/bits/msq-pad.h
index 97dee0beffcc3016ed270fce3b160b9cdc31440b..53f367dfa2ba9d6e24bbe1018203994dbe29a2e3 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/msq-pad.h
+++ b/sysdeps/unix/sysv/linux/bits/msq-pad.h
@@ -20,12 +20,12 @@
 # error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead."
 #endif
 
-#include <bits/wordsize.h>
+#include <bits/timesize.h>
 
 /* On most architectures, padding goes after time fields for 32-bit
    systems and is omitted for 64-bit systems.  Some architectures pad
    before time fields instead, or omit padding despite being
    32-bit.  */
 
-#define __MSQ_PAD_AFTER_TIME (__WORDSIZE == 32)
+#define __MSQ_PAD_AFTER_TIME (__TIMESIZE == 32)
 #define __MSQ_PAD_BEFORE_TIME 0

diff --git a/sysdeps/unix/sysv/linux/bits/sem-pad.h b/sysdeps/unix/sysv/linux/bits/sem-pad.h
index c57fea4ac8186bacee2744b34a74568ad01678de..488b591d5a98b66a591d88160ea680888a8e768f 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/sem-pad.h
+++ b/sysdeps/unix/sysv/linux/bits/sem-pad.h
@@ -20,7 +20,7 @@
 # error "Never use <bits/sem-pad.h> directly; include <sys/sem.h> instead."
 #endif
 
-#include <bits/wordsize.h>
+#include <bits/timesize.h>
 
 /* On most architectures, padding goes after time fields for 32-bit
    systems and is omitted for 64-bit systems.  Some architectures pad
@@ -29,5 +29,5 @@
    used for struct semid64_ds in <asm/sembuf.h>, as glibc does not do
    layout conversions for this structure.  */
 
-#define __SEM_PAD_AFTER_TIME (__WORDSIZE == 32)
+#define __SEM_PAD_AFTER_TIME (__TIMESIZE == 32)
 #define __SEM_PAD_BEFORE_TIME 0

diff --git a/sysdeps/unix/sysv/linux/bits/shm-pad.h b/sysdeps/unix/sysv/linux/bits/shm-pad.h
index 9233c95a9f36870cf1ca42ab87815b49d4e097cb..d3cc5ebde66053dc5284150b523610ecbeee62b5 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/shm-pad.h
+++ b/sysdeps/unix/sysv/linux/bits/shm-pad.h
@@ -20,7 +20,7 @@
 # error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
 #endif
 
-#include <bits/wordsize.h>
+#include <bits/timesize.h>
 
 /* On most architectures, padding goes after time fields for 32-bit
    systems and is omitted for 64-bit systems.  Some architectures pad
@@ -31,7 +31,7 @@
    layout used for struct shmid64_ds in <asm/shmbuf.h>, as glibc does
    not do layout conversions for this structure.  */
 
-#define __SHM_PAD_AFTER_TIME (__WORDSIZE == 32)
+#define __SHM_PAD_AFTER_TIME (__TIMESIZE == 32)
 #define __SHM_PAD_BEFORE_TIME 0
 #define __SHM_SEGSZ_AFTER_TIME 0
 #define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ 0

diff --git a/sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h b/sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h
index 10b26b7ea6a92d48f5f7c368b064938b198fa41f..05db3fd65b260fdd6e1954c40c2e81fa7c20e58c 100644 (file)
--- a/sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/msq-pad.h
@@ -20,7 +20,7 @@
 # error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead."
 #endif
 
-#include <bits/wordsize.h>
+#include <bits/timesize.h>
 
 #define __MSQ_PAD_AFTER_TIME 0
-#define __MSQ_PAD_BEFORE_TIME (__WORDSIZE == 32)
+#define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32)

diff --git a/sysdeps/unix/sysv/linux/hppa/bits/sem-pad.h b/sysdeps/unix/sysv/linux/hppa/bits/sem-pad.h
index a938c2c92b9829b88659b9a177b5f5c9d1732a0b..f250f644265d764c5e4493b8e31999fbb15cad88 100644 (file)
--- a/sysdeps/unix/sysv/linux/hppa/bits/sem-pad.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/sem-pad.h
@@ -20,7 +20,7 @@
 # error "Never use <bits/sem-pad.h> directly; include <sys/sem.h> instead."
 #endif
 
-#include <bits/wordsize.h>
+#include <bits/timesize.h>
 
 #define __SEM_PAD_AFTER_TIME 0
-#define __SEM_PAD_BEFORE_TIME (__WORDSIZE == 32)
+#define __SEM_PAD_BEFORE_TIME (__TIMESIZE == 32)

diff --git a/sysdeps/unix/sysv/linux/hppa/bits/shm-pad.h b/sysdeps/unix/sysv/linux/hppa/bits/shm-pad.h
index 6a9c5ddce2b10e099b11ad7dec1eb56aae8427a8..8764bde08b2487edc124f277d681a6c30146317a 100644 (file)
--- a/sysdeps/unix/sysv/linux/hppa/bits/shm-pad.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/shm-pad.h
@@ -20,9 +20,9 @@
 # error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
 #endif
 
-#include <bits/wordsize.h>
+#include <bits/timesize.h>
 
 #define __SHM_PAD_AFTER_TIME 0
-#define __SHM_PAD_BEFORE_TIME (__WORDSIZE == 32)
+#define __SHM_PAD_BEFORE_TIME (__TIMESIZE == 32)
 #define __SHM_SEGSZ_AFTER_TIME 1
-#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ (__WORDSIZE == 32)
+#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ (__TIMESIZE == 32)

diff --git a/sysdeps/unix/sysv/linux/mips/bits/msq-pad.h b/sysdeps/unix/sysv/linux/mips/bits/msq-pad.h
index 1ddfb0d271aa546a07099a0bd512a06d2139be3a..530babe3f9e28bbc2d58893a78d12bc1a2157a7d 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/bits/msq-pad.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/msq-pad.h
@@ -20,12 +20,12 @@
 # error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead."
 #endif
 
-#include <bits/wordsize.h>
+#include <bits/timesize.h>
 
 #ifdef __MIPSEL__
-# define __MSQ_PAD_AFTER_TIME (__WORDSIZE == 32)
+# define __MSQ_PAD_AFTER_TIME (__TIMESIZE == 32)
 # define __MSQ_PAD_BEFORE_TIME 0
 #else
 # define __MSQ_PAD_AFTER_TIME 0
-# define __MSQ_PAD_BEFORE_TIME (__WORDSIZE == 32)
+# define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32)
 #endif

diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h b/sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h
index 9680176abbea8610b945c14fee89064e658defb7..d19dfd5126aaf937e485ffc341361d133dd6d017 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/msq-pad.h
@@ -20,7 +20,7 @@
 # error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead."
 #endif
 
-#include <bits/wordsize.h>
+#include <bits/timesize.h>
 
 #define __MSQ_PAD_AFTER_TIME 0
-#define __MSQ_PAD_BEFORE_TIME (__WORDSIZE == 32)
+#define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32)

diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/sem-pad.h b/sysdeps/unix/sysv/linux/powerpc/bits/sem-pad.h
index d4c9a939560f4b4efa8fca6f344db717a14eaba4..d7571cc75510a3fbbbfdcd6a7dd9703b222d8b22 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/bits/sem-pad.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/sem-pad.h
@@ -20,7 +20,7 @@
 # error "Never use <bits/sem-pad.h> directly; include <sys/sem.h> instead."
 #endif
 
-#include <bits/wordsize.h>
+#include <bits/timesize.h>
 
 #define __SEM_PAD_AFTER_TIME 0
-#define __SEM_PAD_BEFORE_TIME (__WORDSIZE == 32)
+#define __SEM_PAD_BEFORE_TIME (__TIMESIZE == 32)

diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/shm-pad.h b/sysdeps/unix/sysv/linux/powerpc/bits/shm-pad.h
index 69a7e4a648709137b19b84bacb98bd8e8c6d8700..c8c2d4477560ee74101d6cbf86d2d36bc0769952 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/bits/shm-pad.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/shm-pad.h
@@ -20,9 +20,9 @@
 # error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
 #endif
 
-#include <bits/wordsize.h>
+#include <bits/timesize.h>
 
 #define __SHM_PAD_AFTER_TIME 0
-#define __SHM_PAD_BEFORE_TIME (__WORDSIZE == 32)
+#define __SHM_PAD_BEFORE_TIME (__TIMESIZE == 32)
 #define __SHM_SEGSZ_AFTER_TIME 1
-#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ (__WORDSIZE == 32)
+#define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ (__TIMESIZE == 32)

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h b/sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h
index 3dfeb07a48ffa0b092c33d98e93c1a6249e74170..72324e8428ede9430b8aed287eb6b1a2bd5f048d 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/msq-pad.h
@@ -20,7 +20,7 @@
 # error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead."
 #endif
 
-#include <bits/wordsize.h>
+#include <bits/timesize.h>
 
 #define __MSQ_PAD_AFTER_TIME 0
-#define __MSQ_PAD_BEFORE_TIME (__WORDSIZE == 32)
+#define __MSQ_PAD_BEFORE_TIME (__TIMESIZE == 32)

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/sem-pad.h b/sysdeps/unix/sysv/linux/sparc/bits/sem-pad.h
index b85f6b70a299e6ee70e376416dfc009256386835..27266d48d57f3fd6052b1351f0eb6fa71fa0db92 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/sem-pad.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/sem-pad.h
@@ -20,7 +20,7 @@
 # error "Never use <bits/sem-pad.h> directly; include <sys/sem.h> instead."
 #endif
 
-#include <bits/wordsize.h>
+#include <bits/timesize.h>
 
 #define __SEM_PAD_AFTER_TIME 0
-#define __SEM_PAD_BEFORE_TIME (__WORDSIZE == 32)
+#define __SEM_PAD_BEFORE_TIME (__TIMESIZE == 32)

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/shm-pad.h b/sysdeps/unix/sysv/linux/sparc/bits/shm-pad.h
index c4d0c2feb87cbe55e878081a6927949696001e0a..fa3cc18a05b58dd77897eba05d814aa50188a86d 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/shm-pad.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/shm-pad.h
@@ -20,9 +20,9 @@
 # error "Never use <bits/shm-pad.h> directly; include <sys/shm.h> instead."
 #endif
 
-#include <bits/wordsize.h>
+#include <bits/timesize.h>
 
 #define __SHM_PAD_AFTER_TIME 0
-#define __SHM_PAD_BEFORE_TIME (__WORDSIZE == 32)
+#define __SHM_PAD_BEFORE_TIME (__TIMESIZE == 32)
 #define __SHM_SEGSZ_AFTER_TIME 1
 #define __SHM_PAD_BETWEEN_TIME_AND_SEGSZ 0

diff --git a/sysdeps/unix/sysv/linux/x86/bits/msq-pad.h b/sysdeps/unix/sysv/linux/x86/bits/timesize.h
similarity index 74%
rename from sysdeps/unix/sysv/linux/x86/bits/msq-pad.h
rename to sysdeps/unix/sysv/linux/x86/bits/timesize.h
index 5d46956c7784891baf77778ec0cf12e0b8ceecf5..8b88ab84b0ca59d286e198ae98988a26eb690ad2 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86/bits/msq-pad.h
+++ b/sysdeps/unix/sysv/linux/x86/bits/timesize.h
@@ -1,4 +1,4 @@
-/* Define where padding goes in struct msqid_ds.  x86 version.
+/* Bit size of the time_t type at glibc build time, x86-64 and x32 case.
    Copyright (C) 2018 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -16,13 +16,10 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef _SYS_MSG_H
-# error "Never use <bits/msq-pad.h> directly; include <sys/msg.h> instead."
-#endif
-
-#ifdef __x86_64__
-# define __MSQ_PAD_AFTER_TIME 0
+#if defined __x86_64__ && defined __ILP32__
+/* For x32, time is 64-bit even though word size is 32-bit.  */
+# define __TIMESIZE    64
 #else
-# define __MSQ_PAD_AFTER_TIME 1
+/* For others, time size is word size.  */
+# define __TIMESIZE    __WORDSIZE
 #endif
-#define __MSQ_PAD_BEFORE_TIME 0