about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey Bugaev <bugaevc@gmail.com>2023-05-19 20:15:16 +0300
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2023-05-19 20:25:37 +0200
commit4d3f846b88d307d459a283617778fc11e9bd25ac (patch)
tree196215730676b6e69fdee44cd46e6b2cc34ea39a
parent7b31c02dd29168c90bc04944accdf754bbfb01a6 (diff)
downloadglibc-4d3f846b88d307d459a283617778fc11e9bd25ac.tar.gz
glibc-4d3f846b88d307d459a283617778fc11e9bd25ac.tar.xz
glibc-4d3f846b88d307d459a283617778fc11e9bd25ac.zip
hurd: Fix __TIMESIZE on x86_64
We had sizeof (time_t) == 8, but __TIMESIZE == 32.

Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
Message-Id: <20230519171516.3698754-1-bugaevc@gmail.com>
-rw-r--r--sysdeps/mach/clock_gettime.c2
-rw-r--r--sysdeps/mach/hurd/bits/timesize.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/sysdeps/mach/clock_gettime.c b/sysdeps/mach/clock_gettime.c
index be775ed2bb..9124a32ef7 100644
--- a/sysdeps/mach/clock_gettime.c
+++ b/sysdeps/mach/clock_gettime.c
@@ -111,6 +111,7 @@ strong_alias (__clock_gettime, __clock_gettime_2);
 compat_symbol (libc, __clock_gettime_2, clock_gettime, GLIBC_2_2);
 #endif
 
+#if __TIMESIZE != 64
 int
 __clock_gettime64 (clockid_t clock_id, struct __timespec64 *ts64)
 {
@@ -124,3 +125,4 @@ __clock_gettime64 (clockid_t clock_id, struct __timespec64 *ts64)
   return ret;
 }
 libc_hidden_def (__clock_gettime64)
+#endif
diff --git a/sysdeps/mach/hurd/bits/timesize.h b/sysdeps/mach/hurd/bits/timesize.h
index 900a0a237d..981452c026 100644
--- a/sysdeps/mach/hurd/bits/timesize.h
+++ b/sysdeps/mach/hurd/bits/timesize.h
@@ -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