From 68cbbe7cdc7754d5b8aa2c9072e37745ff3b7604 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 22 Jan 2020 06:30:43 -0800 Subject: [PATCH] runtime: call runtime_nanotime1, not runtime_nanotime The function name was changed in 1.14beta1. Fix the non-x86, non-s390 code. Fixes golang/go#36694 Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/215724 --- gcc/go/gofrontend/MERGE | 2 +- libgo/runtime/runtime_c.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index dff5fb5bc70..61f01d739ff 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -c2225a76d1e15f28056596807ebbbc526d4c58da +94a5ff53df24c58c5e6629ce6720a02aa9986322 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/runtime/runtime_c.c b/libgo/runtime/runtime_c.c index e7951a051a6..18222c14465 100644 --- a/libgo/runtime/runtime_c.c +++ b/libgo/runtime/runtime_c.c @@ -97,7 +97,7 @@ runtime_cputicks(void) // Currently cputicks() is used in blocking profiler and to seed runtime·fastrand(). // runtime·nanotime() is a poor approximation of CPU ticks that is enough for the profiler. // randomNumber provides better seeding of fastrand. - return runtime_nanotime() + randomNumber; + return runtime_nanotime1() + randomNumber; #endif } -- 2.30.2