From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Tue, 24 Dec 2019 05:05:32 +0000 (+0000)
Subject: re PR go/93020 (Final patches to build gcc-10 on GNU/Hurd)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f2a879930992085ca4e4f6b0cdd8d4debc6f4a47;p=gcc.git

re PR go/93020 (Final patches to build gcc-10 on GNU/Hurd)

	PR go/93020
    libgo: Hurd portability patches

    By Svante Signell.

    Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/212409

From-SVN: r279724
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index b2933737c2e..b3aa6561242 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 0b23fc32106..922230b7e8d 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 032b1a9dbff..3a15aad2158 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 bb3e7ffc0fa..b3c6f8062ca 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 120500c3c88..dc11f455de0 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