diff mbox series

[COMMITTED] time: Refactor timesize.h for some ABIs

Message ID 20211231141015.2014473-1-adhemerval.zanella@linaro.org
State Committed
Commit 1f17da01e64efba97c0d39e2b3d01c8034b6db5a
Headers
Series [COMMITTED] time: Refactor timesize.h for some ABIs |

Commit Message

Adhemerval Zanella Netto Dec. 31, 2021, 2:10 p.m. UTC 
  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%)
diff mbox series

Patch

diff --git a/sysdeps/unix/sysv/linux/mips/bits/timesize.h b/sysdeps/unix/sysv/linux/mips/bits/timesize.h
index 95a27ad5b6..8497a6be7d 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/timesize.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/timesize.h
@@ -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
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/bits/timesize.h b/sysdeps/unix/sysv/linux/powerpc/bits/timesize.h
similarity index 93%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/bits/timesize.h
rename to sysdeps/unix/sysv/linux/powerpc/bits/timesize.h
index 33a8bf9862..ace12f9c84 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/bits/timesize.h
+++ b/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
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/bits/timesize.h b/sysdeps/unix/sysv/linux/s390/bits/timesize.h
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
index a3eb9455cd..deb79c4af6 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/bits/timesize.h
+++ b/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
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/bits/timesize.h b/sysdeps/unix/sysv/linux/sparc/bits/timesize.h
similarity index 87%
rename from sysdeps/unix/sysv/linux/sparc/sparc32/bits/timesize.h
rename to sysdeps/unix/sysv/linux/sparc/bits/timesize.h
index 586f4d9fdc..319d88b700 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/bits/timesize.h
+++ b/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