diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 5ef0cc0c78c0..74d94b9b0e16 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -b2bebba1f8a8185546c47f8460a3d5c2e31d0434 +c49c752b4d2934cff325dd540821c4b27cc61a05 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_mipsn32.go b/libgo/go/internal/syscall/unix/getrandom_linux_mips64p32x.go similarity index 87% rename from libgo/go/internal/syscall/unix/getrandom_linux_mipsn32.go rename to libgo/go/internal/syscall/unix/getrandom_linux_mips64p32x.go index 8f481fa58ddc..d8f6ae551d2f 100644 --- a/libgo/go/internal/syscall/unix/getrandom_linux_mipsn32.go +++ b/libgo/go/internal/syscall/unix/getrandom_linux_mips64p32x.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build mipsn32 +// +build mipsn32 mips64p32 mips64p32le package unix