1
- From 729c58cb1c0496497dac6de3d0bf540f6149618f Mon Sep 17 00:00:00 2001
1
+ From 61f3ae8298d1c503cbc31539e0f3a73446c7db9d Mon Sep 17 00:00:00 2001
2
2
From: "Jason A. Donenfeld" <
[email protected] >
3
3
Date: Tue, 21 Mar 2023 15:33:56 +0100
4
4
Subject: [PATCH] [release-branch.go1.20] runtime: use CLOCK_BOOTTIME in
@@ -22,11 +22,11 @@ Change-Id: I7b2a6ca0c5bc5fce57ec0eeafe7b68270b429321
22
22
src/runtime/sys_linux_amd64.s | 2 +-
23
23
src/runtime/sys_linux_arm.s | 4 ++--
24
24
src/runtime/sys_linux_arm64.s | 4 ++--
25
- src/runtime/sys_linux_mips64x.s | 2 + -
25
+ src/runtime/sys_linux_mips64x.s | 4 ++- -
26
26
src/runtime/sys_linux_mipsx.s | 2 +-
27
27
src/runtime/sys_linux_ppc64x.s | 2 +-
28
28
src/runtime/sys_linux_s390x.s | 2 +-
29
- 8 files changed, 11 insertions(+), 11 deletions(-)
29
+ 8 files changed, 12 insertions(+), 12 deletions(-)
30
30
31
31
diff --git a/src/runtime/sys_linux_386.s b/src/runtime/sys_linux_386.s
32
32
index 12a294153d..17e3524b40 100644
@@ -106,7 +106,7 @@ index 38ff6ac330..6b819c5441 100644
106
106
CBZ R2, fallback
107
107
108
108
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
110
110
--- a/src/runtime/sys_linux_mips64x.s
111
111
+++ b/src/runtime/sys_linux_mips64x.s
112
112
@@ -326,7 +326,7 @@ noswitch:
@@ -118,6 +118,15 @@ index 47f2da524d..6c1a9a2801 100644
118
118
MOVV $0(R29), R5
119
119
120
120
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
+
121
130
diff --git a/src/runtime/sys_linux_mipsx.s b/src/runtime/sys_linux_mipsx.s
122
131
index 5e6b6c1504..7f5fd2a80e 100644
123
132
--- a/src/runtime/sys_linux_mipsx.s
@@ -158,5 +167,5 @@ index 1448670b91..7d2ee3231c 100644
158
167
MOVD R15, R7 // Backup stack pointer
159
168
160
169
- -
161
- 2.40.0
170
+ 2.17.1
162
171
0 commit comments