diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index b2933737c2ee854ec61ba9434a42ef68bcc216ff..b3aa6561242697b8c1f759ccc4198fbafdc705b4 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-85641a0f26061f7c98db42a2adb3250c07ce504e
+393957c8b68e370504209eb901aa0c3874e256d4
 
 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/poll/errno_unix.go b/libgo/go/internal/poll/errno_unix.go
index 0b23fc32106f8393e292ecaba8331562f53d71f5..922230b7e8d5d307f0e3ac98d261863429e4cd08 100644
--- a/libgo/go/internal/poll/errno_unix.go
+++ b/libgo/go/internal/poll/errno_unix.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 aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd linux netbsd openbsd solaris
 
 package poll
 
diff --git a/libgo/go/os/export_unix_test.go b/libgo/go/os/export_unix_test.go
index 032b1a9dbffaa232e701ebff0647c11f1dc79406..3a15aad2158f2343c9d833224cf6434737e499d8 100644
--- a/libgo/go/os/export_unix_test.go
+++ b/libgo/go/os/export_unix_test.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 aix darwin dragonfly freebsd js,wasm linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris
 
 package os
 
diff --git a/libgo/go/runtime/os_hurd.go b/libgo/go/runtime/os_hurd.go
index bb3e7ffc0fadce83aaed9c2d3cc31f648203d95e..b3c6f8062ca1c53155b918196084c79435bc876a 100644
--- a/libgo/go/runtime/os_hurd.go
+++ b/libgo/go/runtime/os_hurd.go
@@ -112,7 +112,7 @@ func semawakeup(mp *m) {
 }
 
 func getncpu() int32 {
-	n := int32(sysconf(_SC_NPROCESSORS_ONLN))
+	n := int32(sysconf(__SC_NPROCESSORS_ONLN))
 	if n < 1 {
 		return 1
 	}
diff --git a/libgo/go/syscall/export_unix_test.go b/libgo/go/syscall/export_unix_test.go
index 120500c3c883e6993e457c086d774333ddb7dfdb..dc11f455de05c860e12360c70ae52e7de1fb0cb3 100644
--- a/libgo/go/syscall/export_unix_test.go
+++ b/libgo/go/syscall/export_unix_test.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 aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd linux netbsd openbsd solaris
 
 package syscall