diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 3c0380e8285f0cd1fcd8919598f8556664b926d4..7455d01c1799d56a9f755414d90ee15f2a47073d 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-20e74f9ef8206fb02fd28ce3d6e0f01f6fb95dc9
+aee8eddbfc3ef1b03353a060e79e7d668fb229e2
 
 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/internal/syscall/syscall_other.go b/libgo/go/runtime/internal/syscall/syscall_other.go
new file mode 100644
index 0000000000000000000000000000000000000000..c0945ceec09b2696ad1d86f427878a9fd07929b7
--- /dev/null
+++ b/libgo/go/runtime/internal/syscall/syscall_other.go
@@ -0,0 +1,7 @@
+// Copyright 2022 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build !linux
+
+package syscall