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

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 6039cbc15f577ffe66fc4ab92974dea62d49ad0b..e51285c721422a38fe3a83979c59dee4c79154f2 100644 (file)
--- 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 0eebdfa8004f2271a4632612baa5513c0a8e3646..627b6d6d43caf27ef8edf52e29f2f8b2c40da4bd 100644 (file)
--- 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 2e550151245a6cd1f0c45a94e9b5c90e0c20f623..023dac38ec2438dbdd001f2c9872fb40201f34fc 100644 (file)
--- 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) {