Skip to content

Commit 01e7206

Browse files
syphyrzx2c4
authored andcommitted
tools: add missing CLOCK_BOOTTIME case to mips64x
Signed-off-by: L.W.Reek <[email protected]> Signed-off-by: Jason A. Donenfeld <[email protected]>
1 parent 91a75b6 commit 01e7206

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 729c58cb1c0496497dac6de3d0bf540f6149618f Mon Sep 17 00:00:00 2001
1+
From 61f3ae8298d1c503cbc31539e0f3a73446c7db9d Mon Sep 17 00:00:00 2001
22
From: "Jason A. Donenfeld" <[email protected]>
33
Date: Tue, 21 Mar 2023 15:33:56 +0100
44
Subject: [PATCH] [release-branch.go1.20] runtime: use CLOCK_BOOTTIME in
@@ -22,11 +22,11 @@ Change-Id: I7b2a6ca0c5bc5fce57ec0eeafe7b68270b429321
2222
src/runtime/sys_linux_amd64.s | 2 +-
2323
src/runtime/sys_linux_arm.s | 4 ++--
2424
src/runtime/sys_linux_arm64.s | 4 ++--
25-
src/runtime/sys_linux_mips64x.s | 2 +-
25+
src/runtime/sys_linux_mips64x.s | 4 ++--
2626
src/runtime/sys_linux_mipsx.s | 2 +-
2727
src/runtime/sys_linux_ppc64x.s | 2 +-
2828
src/runtime/sys_linux_s390x.s | 2 +-
29-
8 files changed, 11 insertions(+), 11 deletions(-)
29+
8 files changed, 12 insertions(+), 12 deletions(-)
3030

3131
diff --git a/src/runtime/sys_linux_386.s b/src/runtime/sys_linux_386.s
3232
index 12a294153d..17e3524b40 100644
@@ -106,7 +106,7 @@ index 38ff6ac330..6b819c5441 100644
106106
CBZ R2, fallback
107107

108108
diff --git a/src/runtime/sys_linux_mips64x.s b/src/runtime/sys_linux_mips64x.s
109-
index 47f2da524d..6c1a9a2801 100644
109+
index 47f2da524d..a8b387f193 100644
110110
--- a/src/runtime/sys_linux_mips64x.s
111111
+++ b/src/runtime/sys_linux_mips64x.s
112112
@@ -326,7 +326,7 @@ noswitch:
@@ -118,6 +118,15 @@ index 47f2da524d..6c1a9a2801 100644
118118
MOVV $0(R29), R5
119119

120120
MOVV runtime·vdsoClockgettimeSym(SB), R25
121+
@@ -336,7 +336,7 @@ noswitch:
122+
// see walltime for detail
123+
BEQ R2, R0, finish
124+
MOVV R0, runtime·vdsoClockgettimeSym(SB)
125+
- MOVW $1, R4 // CLOCK_MONOTONIC
126+
+ MOVW $7, R4 // CLOCK_BOOTTIME
127+
MOVV $0(R29), R5
128+
JMP fallback
129+
121130
diff --git a/src/runtime/sys_linux_mipsx.s b/src/runtime/sys_linux_mipsx.s
122131
index 5e6b6c1504..7f5fd2a80e 100644
123132
--- a/src/runtime/sys_linux_mipsx.s
@@ -158,5 +167,5 @@ index 1448670b91..7d2ee3231c 100644
158167
MOVD R15, R7 // Backup stack pointer
159168

160169
--
161-
2.40.0
170+
2.17.1
162171

0 commit comments

Comments
 (0)