diff options
| author | Ian Lance Taylor <iant@golang.org> | 2020-01-22 06:30:43 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-01-22 11:14:52 -0800 |
| commit | 68cbbe7cdc7754d5b8aa2c9072e37745ff3b7604 (patch) | |
| tree | e089ec59b24dcd4d88ae531e3402ba4bc611e756 | |
| parent | e1fd040884ab7ac36ca5555ab5822bcb5e51e8d8 (diff) | |
| download | gcc-68cbbe7cdc7754d5b8aa2c9072e37745ff3b7604.zip gcc-68cbbe7cdc7754d5b8aa2c9072e37745ff3b7604.tar.gz gcc-68cbbe7cdc7754d5b8aa2c9072e37745ff3b7604.tar.bz2 | |
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
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | 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 dff5fb5..61f01d7 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 e7951a0..18222c1 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 } |