[gcc r12-3401] runtime: use hash32, not hash64, for amd64p32, mips64p32, mips64p32le

[gcc r12-3401] runtime: use hash32, not hash64, for amd64p32, mips64p32, mips64p32le

[Ian Lance Taylor]

https://gcc.gnu.org/g:21b046bade1c2666b82139d18c8b318bb051415e

commit r12-3401-g21b046bade1c2666b82139d18c8b318bb051415e
Author: Ian Lance Taylor <iant@golang.org>
Date:   Tue Sep 7 14:37:55 2021 -0700

    runtime: use hash32, not hash64, for amd64p32, mips64p32, mips64p32le
    
    Fixes PR go/102102
    
    Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/348015

Diff:
---
 gcc/go/gofrontend/MERGE    | 2 +-
 libgo/go/runtime/hash32.go | 4 ++--
 libgo/go/runtime/hash64.go | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index e9f38d449a4..c3772694780 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-b3fad6957a04520013197ea7cab11bec3298d552
+e42c7c0216aec70834e8827174458aa4a50169fa
 
 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/hash32.go b/libgo/go/runtime/hash32.go
index 58ae38b200d..0df73035c05 100644
--- a/libgo/go/runtime/hash32.go
+++ b/libgo/go/runtime/hash32.go
@@ -5,8 +5,8 @@
 // Hashing algorithm inspired by
 // wyhash: https://github.com/wangyi-fudan/wyhash/blob/ceb019b530e2c1c14d70b79bfa2bc49de7d95bc1/Modern%20Non-Cryptographic%20Hash%20Function%20and%20Pseudorandom%20Number%20Generator.pdf
 
-//go:build 386 || arm || mips || mipsle || armbe || m68k || nios2 || ppc || riscv || s390 || sh || shbe || sparc
-// +build 386 arm mips mipsle armbe m68k nios2 ppc riscv s390 sh shbe sparc
+//go:build 386 || arm || mips || mipsle || amd64p32 || armbe || m68k || mips64p32 || mips64p32le || nios2 || ppc || riscv || s390 || sh || shbe || sparc
+// +build 386 arm mips mipsle amd64p32 armbe m68k mips64p32 mips64p32le nios2 ppc riscv s390 sh shbe sparc
 
 package runtime
 
diff --git a/libgo/go/runtime/hash64.go b/libgo/go/runtime/hash64.go
index 4b32d515c4b..96ed90b9753 100644
--- a/libgo/go/runtime/hash64.go
+++ b/libgo/go/runtime/hash64.go
@@ -5,8 +5,8 @@
 // Hashing algorithm inspired by
 // wyhash: https://github.com/wangyi-fudan/wyhash
 
-//go:build amd64 || arm64 || mips64 || mips64le || ppc64 || ppc64le || riscv64 || s390x || wasm || alpha || amd64p32 || arm64be || ia64 || mips64p32 || mips64p32le || sparc64
-// +build amd64 arm64 mips64 mips64le ppc64 ppc64le riscv64 s390x wasm alpha amd64p32 arm64be ia64 mips64p32 mips64p32le sparc64
+//go:build amd64 || arm64 || mips64 || mips64le || ppc64 || ppc64le || riscv64 || s390x || wasm || alpha || arm64be || ia64 || sparc64
+// +build amd64 arm64 mips64 mips64le ppc64 ppc64le riscv64 s390x wasm alpha arm64be ia64 sparc64
 
 package runtime