From: Sergey Bugaev <bugaevc@gmail.com>
To: libc-alpha@sourceware.org, bug-hurd@gnu.org
Cc: Samuel Thibault <samuel.thibault@gnu.org>
Subject: [PATCH] hurd: Fix __TIMESIZE on x86_64
Date: Fri, 19 May 2023 20:15:16 +0300 [thread overview]
Message-ID: <20230519171516.3698754-1-bugaevc@gmail.com> (raw)
We had sizeof (time_t) == 8, but __TIMESIZE == 32.
Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
---
...oops.
I have not tested whether this breaks anything (other then checking
that it still builds), but it's kind of amazing that it had worked at
all before this, and there's a higher chance of this fixing something
than breaking something.
Unfortunately I believe this means that all binaries built for
x86_64-gnu so far will have to be rebuilt. Fortunately I don't think
anybody except for myself (and Samuel himself) had installed them.
Discovered while attempting to hack on fcntl{,64,_time64}.
sysdeps/mach/clock_gettime.c | 2 ++
sysdeps/mach/hurd/bits/timesize.h | 4 +++-
sysdeps/mach/hurd/x86_64/libanl.abilist | 1 -
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/sysdeps/mach/clock_gettime.c b/sysdeps/mach/clock_gettime.c
index be775ed2..9124a32e 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 900a0a23..981452c0 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
diff --git a/sysdeps/mach/hurd/x86_64/libanl.abilist b/sysdeps/mach/hurd/x86_64/libanl.abilist
index c0a6a009..baad6de2 100644
--- a/sysdeps/mach/hurd/x86_64/libanl.abilist
+++ b/sysdeps/mach/hurd/x86_64/libanl.abilist
@@ -1,4 +1,3 @@
GLIBC_2.38 gai_cancel F
GLIBC_2.38 gai_error F
-GLIBC_2.38 gai_suspend F
GLIBC_2.38 getaddrinfo_a F
--
2.40.1
next reply other threads:[~2023-05-19 17:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-19 17:15 Sergey Bugaev [this message]
2023-05-19 18:27 ` Samuel Thibault
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230519171516.3698754-1-bugaevc@gmail.com \
--to=bugaevc@gmail.com \
--cc=bug-hurd@gnu.org \
--cc=libc-alpha@sourceware.org \
--cc=samuel.thibault@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).