diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 532cf1e9929..0f5bec0cc6e 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-7fa4eb4b7a32953c2e838f1b0c684a6733172b43
+c3935e1f20ad5b1d4c41150f11fb266913c04df7
 
 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/crypto/sha256/fallback_test.go b/libgo/go/crypto/sha256/fallback_test.go
index 5917a4862af..1a6e6a572d8 100644
--- a/libgo/go/crypto/sha256/fallback_test.go
+++ b/libgo/go/crypto/sha256/fallback_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build ignore
 // +build s390x
 
 package sha256
diff --git a/libgo/go/math/export_s390x_test.go b/libgo/go/math/export_s390x_test.go
index 3fdbd8640fe..2e7f584dc3f 100644
--- a/libgo/go/math/export_s390x_test.go
+++ b/libgo/go/math/export_s390x_test.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build ignore
+
 package math
 
 // Export internal functions and variable for testing.