aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2020-06-15 13:57:39 +0200
committerIan Lance Taylor <iant@golang.org>2020-06-15 12:00:12 -0700
commit47ad09cb086715182eff01ef3da2fb7d79b0a396 (patch)
treeafa35cf56dac73545977bc82275f492905793534
parentc7bac01ab41f019a66bc07fc704752f436707eb8 (diff)
downloadgcc-47ad09cb086715182eff01ef3da2fb7d79b0a396.zip
gcc-47ad09cb086715182eff01ef3da2fb7d79b0a396.tar.gz
gcc-47ad09cb086715182eff01ef3da2fb7d79b0a396.tar.bz2
internal/syscall/unix: use getrandom_linux_generic.go on riscv
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/237899
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/internal/syscall/unix/getrandom_linux_generic.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index c8b78bf..9a33735 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-74199467ea912138c1b76e9a156bb47886be1436
+925d115397e7ec663f669ee5ac31b6dfccea5724
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/internal/syscall/unix/getrandom_linux_generic.go b/libgo/go/internal/syscall/unix/getrandom_linux_generic.go
index 0c79ae5..007e769 100644
--- a/libgo/go/internal/syscall/unix/getrandom_linux_generic.go
+++ b/libgo/go/internal/syscall/unix/getrandom_linux_generic.go
@@ -3,7 +3,7 @@
// license that can be found in the LICENSE file.
// +build linux
-// +build arm64 arm64be nios2 riscv64
+// +build arm64 arm64be nios2 riscv riscv64
package unix