From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1792) id CB9653858C41; Fri, 19 May 2023 18:25:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CB9653858C41 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684520741; bh=Vkin3lZUnOkEe//2m6Z8MkOYsbdSKNVq7lYviSRGhQs=; h=From:To:Subject:Date:From; b=wtMVfCaquJOjeUnS4WcGoJsamhofsTCSmurE7gC2BcYL3QFdGEihYV4fNopARLTrq JhdC+kRF4FFaAYNdGXv72SYIvpbds/FxNsyJ+oJEUQkmd2kMTJXGFzcW8v9AcObAEm bLi7oCBwvUWZ6j8Uo+D9sesqokuYDy/uhUOoowyQ= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Samuel Thibault To: glibc-cvs@sourceware.org Subject: [glibc] hurd: Fix __TIMESIZE on x86_64 X-Act-Checkin: glibc X-Git-Author: Sergey Bugaev X-Git-Refname: refs/heads/master X-Git-Oldrev: 7b31c02dd29168c90bc04944accdf754bbfb01a6 X-Git-Newrev: 4d3f846b88d307d459a283617778fc11e9bd25ac Message-Id: <20230519182541.CB9653858C41@sourceware.org> Date: Fri, 19 May 2023 18:25:41 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=4d3f846b88d307d459a283617778fc11e9bd25ac commit 4d3f846b88d307d459a283617778fc11e9bd25ac Author: Sergey Bugaev Date: Fri May 19 20:15:16 2023 +0300 hurd: Fix __TIMESIZE on x86_64 We had sizeof (time_t) == 8, but __TIMESIZE == 32. Signed-off-by: Sergey Bugaev Message-Id: <20230519171516.3698754-1-bugaevc@gmail.com> Diff: --- sysdeps/mach/clock_gettime.c | 2 ++ sysdeps/mach/hurd/bits/timesize.h | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) 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 . */ +#include + /* Size in bits of the 'time_t' type of the default ABI. */ -#define __TIMESIZE 32 +#define __TIMESIZE __WORDSIZE