diff options
| author | Ian Lance Taylor <iant@golang.org> | 2021-01-01 11:51:50 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2021-01-01 15:11:45 -0800 |
| commit | 0b9ef8be40b8ec530e46779a694e3b115b8e685d (patch) | |
| tree | f4e8435ac2f1306a9959c0a3df4d7333601d132e | |
| parent | abca6705969b59edae86f11233f9d207cbdd1e06 (diff) | |
| download | gcc-0b9ef8be40b8ec530e46779a694e3b115b8e685d.zip gcc-0b9ef8be40b8ec530e46779a694e3b115b8e685d.tar.gz gcc-0b9ef8be40b8ec530e46779a694e3b115b8e685d.tar.bz2 | |
runtime: move startupRandomData back to runtime2.go
In libgo it's referenced from os_gccgo.go on all platforms.
Fixes go/98496
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/280999
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/runtime/os_linux.go | 4 | ||||
| -rw-r--r-- | libgo/go/runtime/runtime2.go | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 6039cbc..e51285c 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -6857530fb1662c05a3ce754df2bd9fa5acd3a35b +fa161cb71880cf80ef53fb4bf35dba8ee01af648 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/runtime/os_linux.go b/libgo/go/runtime/os_linux.go index 0eebdfa..627b6d6 100644 --- a/libgo/go/runtime/os_linux.go +++ b/libgo/go/runtime/os_linux.go @@ -178,10 +178,6 @@ func sysargs(argc int32, argv **byte) { sysauxv(buf[:]) } -// startupRandomData holds random bytes initialized at startup. These come from -// the ELF AT_RANDOM auxiliary vector. -var startupRandomData []byte - func sysauxv(auxv []uintptr) int { var i int for ; auxv[i] != _AT_NULL; i += 2 { diff --git a/libgo/go/runtime/runtime2.go b/libgo/go/runtime/runtime2.go index 2e55015..023dac3 100644 --- a/libgo/go/runtime/runtime2.go +++ b/libgo/go/runtime/runtime2.go @@ -885,6 +885,10 @@ type forcegcstate struct { idle uint32 } +// startupRandomData holds random bytes initialized at startup. These come from +// the ELF AT_RANDOM auxiliary vector. +var startupRandomData []byte + // extendRandom extends the random numbers in r[:n] to the whole slice r. // Treats n<0 as n==0. func extendRandom(r []byte, n int) { |