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

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index dff5fb5bc706e152959b0981cd8177a3e0aced84..61f01d739ff944c1f43fe7aacd3ae9cfeaa9e011 100644 (file)
--- 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 e7951a051a67cb40b74ff245240950a2d8355dd2..18222c14465ca023c84ed7d43623b74dde9ddc06 100644 (file)
--- 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
 }