[COMMITTED] time: Refactor timesize.h for some ABIs
Commit Message
Commit a4b413135535c83a changed default __TIMESIZE to 64, however
it added sub-architecture timesize.h for powerpc, s390, and
sparc.
Also simplify mips by removing _MIPS_SIM usage (which would require
to add sgidefs inclusion.
---
sysdeps/unix/sysv/linux/mips/bits/timesize.h | 8 +++-----
.../sysv/linux/powerpc/{powerpc32 => }/bits/timesize.h | 6 ++++--
.../unix/sysv/linux/s390/{s390-32 => }/bits/timesize.h | 6 ++++--
.../unix/sysv/linux/sparc/{sparc32 => }/bits/timesize.h | 6 ++++--
4 files changed, 15 insertions(+), 11 deletions(-)
rename sysdeps/unix/sysv/linux/powerpc/{powerpc32 => }/bits/timesize.h (93%)
rename sysdeps/unix/sysv/linux/s390/{s390-32 => }/bits/timesize.h (87%)
rename sysdeps/unix/sysv/linux/sparc/{sparc32 => }/bits/timesize.h (87%)
@@ -16,9 +16,7 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
+#include <bits/wordsize.h>
+
/* Size in bits of the 'time_t' type of the default ABI. */
-#if _MIPS_SIM == _ABI64
-# define __TIMESIZE 64
-#else
-# define __TIMESIZE 32
-#endif
+#define __TIMESIZE __WORDSIZE
similarity index 93%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/bits/timesize.h
rename to sysdeps/unix/sysv/linux/powerpc/bits/timesize.h
@@ -1,4 +1,4 @@
-/* Bit size of the time_t type at glibc build time, Linux/PowerPC 32-bits.
+/* Bit size of the time_t type at glibc build time, Linux/PowerPC.
Copyright (C) 2021 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -16,5 +16,7 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
+#include <bits/wordsize.h>
+
/* Size in bits of the 'time_t' type of the default ABI. */
-#define __TIMESIZE 32
+#define __TIMESIZE __WORDSIZE
similarity index 87%
rename from sysdeps/unix/sysv/linux/s390/s390-32/bits/timesize.h
rename to sysdeps/unix/sysv/linux/s390/bits/timesize.h
@@ -1,4 +1,4 @@
-/* Bit size of the time_t type at glibc build time, Linux/s390 32-bits.
+/* Bit size of the time_t type at glibc build time, Linux/s390.
Copyright (C) 2021 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -16,5 +16,7 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
+#include <bits/wordsize.h>
+
/* Size in bits of the 'time_t' type of the default ABI. */
-#define __TIMESIZE 32
+#define __TIMESIZE __WORDSIZE
similarity index 87%
rename from sysdeps/unix/sysv/linux/sparc/sparc32/bits/timesize.h
rename to sysdeps/unix/sysv/linux/sparc/bits/timesize.h
@@ -1,4 +1,4 @@
-/* Bit size of the time_t type at glibc build time, Linux/sparc 32-bits.
+/* Bit size of the time_t type at glibc build time, Linux/sparc.
Copyright (C) 2021 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -16,5 +16,7 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
+#include <bits/wordsize.h>
+
/* Size in bits of the 'time_t' type of the default ABI. */
-#define __TIMESIZE 32
+#define __TIMESIZE __WORDSIZE