From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ian@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2116)
 id C06113858403; Sat, 30 Jul 2022 17:35:37 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C06113858403
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="utf-8"
From: Ian Lance Taylor <ian@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r13-1899] libgo: use SYS_timer_settime32
X-Act-Checkin: gcc
X-Git-Author: Ian Lance Taylor <iant@golang.org>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 2fa8c4a659a19ec971c80704f48f96c13aae9ac3
X-Git-Newrev: a63b99f24df3f2a65133e22dd8a0f70e7b706fd6
Message-Id: <20220730173537.C06113858403@sourceware.org>
Date: Sat, 30 Jul 2022 17:35:37 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jul 2022 17:35:37 -0000

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.