In the update of libgo to Go1.14beta1, the function runtime_nanotime was renamed to runtime_nanotime1. I missed one reference that is not compiled on x86 code. This patch fixes that. This fixes https://golang.org/issue/36694. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline.
Ian
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 }
