Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use CLOCK_BOOTTIME also for amd64's time.now() in Go runtime #71

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ Change-Id: I7b2a6ca0c5bc5fce57ec0eeafe7b68270b429321
src/runtime/sys_linux_mipsx.s | 2 +-
src/runtime/sys_linux_ppc64x.s | 2 +-
src/runtime/sys_linux_s390x.s | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
src/runtime/time_linux_amd64.s | 4 ++--
9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/runtime/sys_linux_386.s b/src/runtime/sys_linux_386.s
index 12a294153d..17e3524b40 100644
Expand Down Expand Up @@ -165,7 +166,28 @@ index 1448670b91..7d2ee3231c 100644
+ MOVW $7, R2 // CLOCK_BOOTTIME

MOVD R15, R7 // Backup stack pointer

--
2.17.1

diff --git a/src/runtime/time_linux_amd64.s b/src/runtime/time_linux_amd64.s
index 1416d23230..8d42242505 100644
--- a/src/runtime/time_linux_amd64.s
+++ b/src/runtime/time_linux_amd64.s
@@ -46,7 +46,7 @@ noswitch:
JEQ fallback
CALL AX

- MOVL $1, DI // CLOCK_MONOTONIC
+ MOVL $7, DI // CLOCK_BOOTTIME
LEAQ 0(SP), SI
MOVQ runtime·vdsoClockgettimeSym(SB), AX
CALL AX
@@ -79,7 +79,7 @@ fallback:
MOVQ $SYS_clock_gettime, AX
SYSCALL

- MOVL $1, DI // CLOCK_MONOTONIC
+ MOVL $7, DI // CLOCK_BOOTTIME
LEAQ 0(SP), SI
MOVQ $SYS_clock_gettime, AX
SYSCALL
--
2.43.0