public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-1899] libgo: use SYS_timer_settime32
@ 2022-07-30 17:35 Ian Lance Taylor
0 siblings, 0 replies; only message in thread
From: Ian Lance Taylor @ 2022-07-30 17:35 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:a63b99f24df3f2a65133e22dd8a0f70e7b706fd6
commit r13-1899-ga63b99f24df3f2a65133e22dd8a0f70e7b706fd6
Author: Ian Lance Taylor <iant@golang.org>
Date: Sat Jul 30 07:29:28 2022 -0700
libgo: use SYS_timer_settime32
Musl defines SYS_timer_settime32, not SYS_timer_settime, on 32-bit systems.
Based on patch by Sören Tempel.
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/420222
Diff:
---
gcc/go/gofrontend/MERGE | 2 +-
libgo/sysinfo.c | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 2f2fafde1f1..ca797045d66 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-a62f20ae78ddd41be682dde8cab075ca4f5dbb2a
+d53e8a0e94e34dc609e34dd5e404debda2640cfb
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
index fc0210992fa..180f5c31d74 100644
--- a/libgo/sysinfo.c
+++ b/libgo/sysinfo.c
@@ -354,6 +354,11 @@ enum {
};
#endif
+#if !defined(SYS_timer_settime) && defined(SYS_timer_settime32)
+// musl defines SYS_timer_settim32 on 32-bit systems.
+#define SYS_timer_settime SYS_timer_settime32
+#endif
+
#if defined(HAVE_LOFF_T)
// loff_t can be defined as a macro; for -fgo-dump-spec make sure we
// see a typedef.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-07-30 17:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-30 17:35 [gcc r13-1899] libgo: use SYS_timer_settime32 Ian Lance Taylor
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).