* [PATCH] Updated patches for the port of gccgo to GNU/Hurd
@ 2019-01-31 15:44 Svante Signell
2019-02-07 5:04 ` Ian Lance Taylor
0 siblings, 1 reply; 13+ messages in thread
From: Svante Signell @ 2019-01-31 15:44 UTC (permalink / raw)
To: gcc-patches; +Cc: Ian Lance Taylor, Matthias Klose
[-- Attachment #1: Type: text/plain, Size: 1623 bytes --]
Hello,
As advised by the Debian gcc maintainer Matthias Klose and golang
developer Ian Lance Taylor I'm re-submitting the patches for
the port of gccgo to GNU/Hurd again. Now GOOS value is changed from gnu
to hurd as requested.
The 12 patches are:
src_libgo_build.diff
src_libgo_runtime.diff
src_libgo_go_crypto.diff
src_libgo_go_internal.diff
src_libgo_go_net.diff
src_libgo_go_os.diff
src_libgo_go_runtime.diff
src_libgo_go_syscall.diff
src_libgo_go_test.diff
src_libgo_testsuite_gotest.diff
add-hurd-to-libgo-headers.diff
add-hurd-to-libgo-test-headers.diff
Added is also the patch to apply these patches for a Debian build:
debian_rules.patch.diff
Preliminary ChangeLog entries are included in each patch.
With them the latest the latest Debian gcc-snapshot (20190125-2) has
been successfully built. Test results (varies slightly) for libgo and go:
=== libgo Summary ===
# of expected passes 160
# of unexpected failures 24
=== go Summary ===
# of expected passes 518
# of untested testcases 834
Note that similar numbers are obtained also for Linux.
After these patches have been applied upstream some further work is needed to go
through the tests, and enable/disable some of them to work properly (and find
the sigaltstack bugs in Hurd).
I do also have a wish: Can you upstream, and Debian use autoreconf to create
Makefile.in files from Makefile.am files now when the build system supports
recent versions of autoconf and automake. It is very cumbersome to create
patches for Maikefile.in files compared to Makefil.am ones.
Thanks!
[-- Attachment #2: add-hurd-to-libgo-headers.diff --]
[-- Type: text/x-patch, Size: 58699 bytes --]
libgo/ChangeLog
2019-01-28 Svante Signell <svante.signell@gmail.com>
* libgo/go/syscall/socket_bsd.go: Add +build hurd directive.
* libgo/go/os/error_posix.go: Likewise
* libgo/go/os/removeall_at.go: Likewise
* libgo/go/os/removeall_noat.go: Add +build !hurd directive.
* libgo/go/runtime/signal_unix.go: Add +build hurd directive.
* libgo/go/cmd/go/internal/lockedfile/internal/filelock/filelock_unix.go: Likewise
* libgo/go/cmd/go/internal/lockedfile/internal/filelock/filelock_other.go: Add +build !hurd directive.
* libgo/go/net/sockoptip_bsdvar.go: Add +build hurd directive.
* libgo/go/net/sock_stub.go: Likewise
* libgo/go/internal/poll/fd_fsync_posix.go: Likewise
2018-10-20 Svante Signell <svante.signell@gmail.com>
* libgo/go/.../*.go: Add +build hurd directive.
Index: gcc-9-9-20190125-2.1/src/libgo/go/cmd/go/internal/base/signal_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/cmd/go/internal/base/signal_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/cmd/go/internal/base/signal_unix.go
@@ -1,8 +1,9 @@
+
// Copyright 2012 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.
-// +build aix darwin dragonfly freebsd js linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd js linux nacl netbsd openbsd solaris
package base
Index: gcc-9-9-20190125-2.1/src/libgo/go/crypto/x509/root_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/crypto/x509/root_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/crypto/x509/root_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 dragonfly freebsd js,wasm linux nacl netbsd openbsd solaris
+// +build aix dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris
package x509
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/interface_stub.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/interface_stub.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/interface_stub.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 nacl js,wasm
+// +build aix nacl hurd js,wasm
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/internal/socktest/switch_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/internal/socktest/switch_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/internal/socktest/switch_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 js,wasm linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris
package socktest
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/port_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/port_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/port_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 js,wasm linux netbsd openbsd solaris nacl
+// +build aix darwin dragonfly freebsd hurd js,wasm linux netbsd openbsd solaris nacl
// Read system port mappings from /etc/services
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/dir_largefile.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/dir_largefile.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/dir_largefile.go
@@ -5,7 +5,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// +build aix linux solaris,386 solaris,sparc
+// +build aix hurd linux solaris,386 solaris,sparc
package os
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/dir_regfile.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/dir_regfile.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/dir_regfile.go
@@ -6,6 +6,7 @@
// license that can be found in the LICENSE file.
// +build !aix
+// +build !hurd
// +build !linux
// +build !solaris !386
// +build !solaris !sparc
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/exec_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/exec_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/exec_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 js,wasm linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris
package os
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/stat_atim.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/stat_atim.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/stat_atim.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 linux openbsd solaristag
+// +build hurd linux openbsd solaristag
package os
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/stat_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/stat_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/stat_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 js,wasm linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris
package os
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/sys_uname.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/sys_uname.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/sys_uname.go
@@ -4,7 +4,7 @@
// For systems which only store the hostname in uname (Solaris).
-// +build aix solaris irix rtems
+// +build aix hurd solaris irix rtems
package os
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/user/listgroups_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/user/listgroups_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/user/listgroups_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 dragonfly darwin freebsd !android,linux netbsd openbsd
+// +build dragonfly darwin freebsd hurd !android,linux netbsd openbsd
// +build cgo,!osusergo
package user
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/wait_unimp.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/wait_unimp.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/wait_unimp.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 js,wasm nacl netbsd openbsd solaris
+// +build aix darwin dragonfly hurd js,wasm nacl netbsd openbsd solaris
package os
Index: gcc-9-9-20190125-2.1/src/libgo/go/path/filepath/path_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/path/filepath/path_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/path/filepath/path_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 js,wasm linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris
package filepath
Index: gcc-9-9-20190125-2.1/src/libgo/go/runtime/env_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/runtime/env_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/runtime/env_posix.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 windows
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris windows
package runtime
Index: gcc-9-9-20190125-2.1/src/libgo/go/runtime/lock_sema.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/runtime/lock_sema.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/runtime/lock_sema.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 nacl netbsd openbsd plan9 solaris windows
+// +build aix darwin hurd nacl netbsd openbsd plan9 solaris windows
package runtime
Index: gcc-9-9-20190125-2.1/src/libgo/go/runtime/netpoll.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/runtime/netpoll.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/runtime/netpoll.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 windows
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris windows
package runtime
Index: gcc-9-9-20190125-2.1/src/libgo/go/runtime/signal_gccgo.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/runtime/signal_gccgo.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/runtime/signal_gccgo.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 runtime
Index: gcc-9-9-20190125-2.1/src/libgo/go/runtime/signal_sighandler.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/runtime/signal_sighandler.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/runtime/signal_sighandler.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 nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd linux nacl netbsd openbsd solaris
package runtime
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/errstr.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/syscall/errstr.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/errstr.go
@@ -4,6 +4,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
+// +build !hurd
// +build !linux
package syscall
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/libcall_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/syscall/libcall_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/libcall_posix.go
@@ -9,6 +9,8 @@
// Note that sometimes we use a lowercase //sys name and
// wrap it in our own nicer implementation.
+// +build !hurd
+
package syscall
import "unsafe"
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/libcall_posix_largefile.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/syscall/libcall_posix_largefile.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/libcall_posix_largefile.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 linux solaris,386 solaris,sparc
+// +build aix hurd linux solaris,386 solaris,sparc
// POSIX library calls on systems which use the largefile interface.
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/libcall_posix_regfile.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/syscall/libcall_posix_regfile.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/libcall_posix_regfile.go
@@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.
// +build !aix
+// +build !hurd
// +build !linux
// +build !solaris !386
// +build !solaris !sparc
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/libcall_posix_utimesnano.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/syscall/libcall_posix_utimesnano.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/libcall_posix_utimesnano.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 openbsd netbsd solaris
+// +build aix darwin dragonfly freebsd hurd openbsd netbsd solaris
// General POSIX version of UtimesNano.
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/cgo_resnew.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/cgo_resnew.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/cgo_resnew.go
@@ -3,7 +3,7 @@
// license that can be found in the LICENSE file.
// +build cgo,!netgo
-// +build aix darwin linux,!android netbsd solaris
+// +build aix darwin hurd linux,!android netbsd solaris
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/cgo_sockold.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/cgo_sockold.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/cgo_sockold.go
@@ -3,7 +3,7 @@
// license that can be found in the LICENSE file.
// +build cgo,!netgo
-// +build aix darwin dragonfly freebsd netbsd openbsd
+// +build aix darwin dragonfly freebsd hurd netbsd openbsd
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/fd_poll_runtime.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/internal/poll/fd_poll_runtime.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/fd_poll_runtime.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 windows solaris
+// +build aix darwin dragonfly freebsd hurd linux netbsd openbsd windows solaris
package poll
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/hook_cloexec.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/internal/poll/hook_cloexec.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/hook_cloexec.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 dragonfly freebsd linux netbsd openbsd
+// +build dragonfly freebsd hurd linux netbsd openbsd
package poll
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/fd_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/internal/poll/fd_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/fd_posix.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 windows
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris windows
package poll
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/sock_cloexec.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/sock_cloexec.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/sock_cloexec.go
@@ -5,7 +5,7 @@
// This file implements sysSocket and accept for platforms that
// provide a fast path for setting SetNonblock and CloseOnExec.
-// +build dragonfly freebsd linux netbsd openbsd
+// +build dragonfly freebsd hurd linux netbsd openbsd
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/exec/lp_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/exec/lp_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/exec/lp_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 nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd linux nacl netbsd openbsd solaris
package exec
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/signal/signal_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/signal/signal_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/signal/signal_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 js,wasm linux nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris windows
package signal
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/error_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/error_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/error_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 js,wasm linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris
package os
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/file_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/file_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/file_posix.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 windows
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris windows
package os
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/path_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/path_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/path_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 js,wasm linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris
package os
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/sys_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/sys_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/sys_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 os
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/user/decls_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/user/decls_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/user/decls_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 darwin dragonfly freebsd linux netbsd openbsd
+// +build darwin dragonfly freebsd hurd linux netbsd openbsd
// +build cgo
package user
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/user/lookup_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/user/lookup_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/user/lookup_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 js,wasm !android,linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd js,wasm !android,linux nacl netbsd openbsd solaris
// +build !cgo osusergo
package user
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/env_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/syscall/env_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/env_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 js,wasm linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris
// Unix environment variables.
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/exec_bsd.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/syscall/exec_bsd.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/exec_bsd.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 netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd netbsd openbsd solaris
package syscall
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/sockcmsg_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/syscall/sockcmsg_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/sockcmsg_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
// Socket control messages
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/syscall_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/syscall/syscall_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/syscall_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 syscall
Index: gcc-9-9-20190125-2.1/src/libgo/go/time/sys_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/time/sys_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/time/sys_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 js,wasm linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris
package time
Index: gcc-9-9-20190125-2.1/src/libgo/go/time/zoneinfo_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/time/zoneinfo_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/time/zoneinfo_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,386 darwin,amd64 dragonfly freebsd js,wasm linux,!android nacl netbsd openbsd solaris
+// +build aix darwin,386 darwin,amd64 dragonfly freebsd hurd js,wasm linux,!android nacl netbsd openbsd solaris
// Parse "zoneinfo" time zone file.
// This is a fairly standard file format used on OS X, Linux, BSD, Sun, and others.
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/addrselect.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/addrselect.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/addrselect.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
// Minimal RFC 6724 address selection.
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/conf.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/conf.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/conf.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 net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/dnsclient_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/dnsclient_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/dnsclient_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
// DNS client: see RFC 1035.
// Has to be linked into package net for Dial.
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/dnsconfig_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/dnsconfig_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/dnsconfig_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
// Read system DNS config from /etc/resolv.conf
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/fd_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/fd_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/fd_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 nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd linux nacl netbsd openbsd solaris
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/file_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/file_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/file_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 net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/hook_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/hook_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/hook_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 js,wasm linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/iprawsock_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/iprawsock_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/iprawsock_posix.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 windows
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris windows
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/ipsock_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/ipsock_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/ipsock_posix.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 windows
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris windows
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/lookup_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/lookup_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/lookup_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 net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/nss.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/nss.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/nss.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 net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/sockopt_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/sockopt_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/sockopt_posix.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 windows
+// +build aix darwin dragonfly freebsd hurd linux netbsd openbsd solaris windows
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/sock_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/sock_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/sock_posix.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 nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd hurd linux nacl netbsd openbsd solaris windows
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/tcpsockopt_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/tcpsockopt_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/tcpsockopt_posix.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 windows
+// +build aix darwin dragonfly freebsd hurd linux netbsd openbsd solaris windows
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/tcpsockopt_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/tcpsockopt_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/tcpsockopt_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 freebsd linux netbsd
+// +build aix freebsd hurd linux netbsd
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/tcpsock_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/tcpsock_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/tcpsock_posix.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 windows
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris windows
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/udpsock_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/udpsock_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/udpsock_posix.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 windows
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris windows
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/unixsock_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/unixsock_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/unixsock_posix.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 windows
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris windows
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/exec_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/exec_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/exec_posix.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 windows
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris windows
package os
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/file_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/file_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/file_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 js,wasm linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris
package os
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/executable_procfs.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/executable_procfs.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/executable_procfs.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 linux netbsd dragonfly nacl js,wasm
+// +build hurd linux netbsd dragonfly nacl js,wasm
package os
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/timestruct.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/syscall/timestruct.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/timestruct.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 syscall
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/cgo_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/cgo_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/cgo_unix.go
@@ -3,7 +3,7 @@
// license that can be found in the LICENSE file.
// +build cgo,!netgo
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd linux netbsd openbsd solaris
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/archive/tar/stat_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/archive/tar/stat_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/archive/tar/stat_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 linux darwin dragonfly freebsd openbsd netbsd solaris
+// +build aix hurd linux darwin dragonfly freebsd openbsd netbsd solaris
package tar
Index: gcc-9-9-20190125-2.1/src/libgo/go/crypto/rand/eagain.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/crypto/rand/eagain.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/crypto/rand/eagain.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 nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd linux nacl netbsd openbsd solaris
package rand
Index: gcc-9-9-20190125-2.1/src/libgo/go/crypto/rand/rand_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/crypto/rand/rand_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/crypto/rand/rand_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 nacl netbsd openbsd plan9 solaris
+// +build aix darwin dragonfly freebsd hurd linux nacl netbsd openbsd plan9 solaris
// Unix cryptographically secure pseudorandom number
// generator.
Index: gcc-9-9-20190125-2.1/src/libgo/go/mime/type_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/mime/type_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/mime/type_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 js,wasm linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris
package mime
Index: gcc-9-9-20190125-2.1/src/libgo/go/plugin/plugin_dlopen.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/plugin/plugin_dlopen.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/plugin/plugin_dlopen.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 linux,cgo darwin,cgo
+// +build linux,cgo darwin,cgo hurd,cgo
package plugin
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/dirent.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/syscall/dirent.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/dirent.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 syscall
Index: gcc-9-9-20190125-2.1/src/libgo/runtime/env_posix.c
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/runtime/env_posix.c
+++ gcc-9-9-20190125-2.1/src/libgo/runtime/env_posix.c
@@ -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 darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+// +build darwin dragonfly freebsd hurd linux nacl netbsd openbsd solaris windows
#include "runtime.h"
#include "array.h"
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/internal/socktest/sys_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/internal/socktest/sys_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/internal/socktest/sys_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 js,wasm linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris
package socktest
Index: gcc-9-9-20190125-2.1/src/libgo/go/plugin/plugin_stubs.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/plugin/plugin_stubs.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/plugin/plugin_stubs.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 !linux,!darwin !cgo
+// +build !hurd !linux,!darwin !cgo
package plugin
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/internal/socktest/sys_cloexec.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/internal/socktest/sys_cloexec.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/internal/socktest/sys_cloexec.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 dragonfly freebsd linux netbsd openbsd
+// +build dragonfly freebsd hurd linux netbsd openbsd
package socktest
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/user/cgo_lookup_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/user/cgo_lookup_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/user/cgo_lookup_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 !android,linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd !android,linux netbsd openbsd solaris
// +build cgo,!osusergo
package user
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/error_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/error_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/error_posix.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 windows
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris windows
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/fd_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/internal/poll/fd_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/fd_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 js,wasm linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris
package poll
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/hook_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/internal/poll/hook_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/hook_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 js,wasm linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris
package poll
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/sock_cloexec.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/internal/poll/sock_cloexec.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/sock_cloexec.go
@@ -5,7 +5,7 @@
// This file implements sysSocket and accept for platforms that
// provide a fast path for setting SetNonblock and CloseOnExec.
-// +build dragonfly freebsd linux netbsd openbsd
+// +build dragonfly freebsd hurd linux netbsd openbsd
package poll
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/sockopt.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/internal/poll/sockopt.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/sockopt.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 windows
+// +build aix darwin dragonfly freebsd hurd linux netbsd openbsd solaris windows
package poll
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/sockoptip.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/internal/poll/sockoptip.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/sockoptip.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 windows
+// +build aix darwin dragonfly freebsd hurd linux netbsd openbsd solaris windows
package poll
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/sockopt_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/internal/poll/sockopt_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/sockopt_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
Index: gcc-9-9-20190125-2.1/src/libgo/go/archive/tar/stat_actime1.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/archive/tar/stat_actime1.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/archive/tar/stat_actime1.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 linux dragonfly openbsd solaris
+// +build hurd linux dragonfly openbsd solaris
package tar
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/x/net/internal/nettest/helper_nobsd.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/internal/x/net/internal/nettest/helper_nobsd.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/internal/x/net/internal/nettest/helper_nobsd.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 linux solaris
+// +build aix hurd linux solaris
package nettest
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/x/net/internal/nettest/helper_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/internal/x/net/internal/nettest/helper_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/internal/x/net/internal/nettest/helper_posix.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 windows
+// +build aix darwin dragonfly freebsd hurd linux netbsd openbsd solaris windows
package nettest
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/x/net/internal/nettest/helper_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/internal/x/net/internal/nettest/helper_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/internal/x/net/internal/nettest/helper_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 nettest
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/sockoptip_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/sockoptip_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/sockoptip_posix.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 windows
+// +build aix darwin dragonfly freebsd hurd linux netbsd openbsd solaris windows
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/signal/internal/pty/pty.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/signal/internal/pty/pty.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/signal/internal/pty/pty.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,!android netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd linux,!android netbsd openbsd solaris
// +build cgo
// Package pty is a simple pseudo-terminal package for Unix systems,
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/forkpipe2.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/syscall/forkpipe2.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/forkpipe2.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 freebsd netbsd openbsd
+// +build freebsd hurd netbsd openbsd
package syscall
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/syscall/unix/nonblocking.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/internal/syscall/unix/nonblocking.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/internal/syscall/unix/nonblocking.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 dragonfly freebsd linux netbsd openbsd solaris
+// +build aix dragonfly freebsd hurd linux netbsd openbsd solaris
package unix
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/sockaddr_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/sockaddr_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/sockaddr_posix.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 windows
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris windows
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/error_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/error_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/error_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 js linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd js linux netbsd openbsd solaris
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/fd_fsync_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/internal/poll/fd_fsync_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/fd_fsync_posix.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 dragonfly freebsd js,wasm linux nacl netbsd openbsd solaris
+// +build aix dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris
package poll
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/sock_stub.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/sock_stub.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/sock_stub.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 nacl js,wasm solaris
+// +build aix hurd nacl js,wasm solaris
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/sockoptip_bsdvar.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/sockoptip_bsdvar.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/sockoptip_bsdvar.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 netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd netbsd openbsd solaris
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/cmd/go/internal/lockedfile/internal/filelock/filelock_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/cmd/go/internal/lockedfile/internal/filelock/filelock_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/cmd/go/internal/lockedfile/internal/filelock/filelock_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 darwin dragonfly freebsd linux netbsd openbsd
+// +build darwin dragonfly freebsd hurd linux netbsd openbsd
package filelock
Index: gcc-9-9-20190125-2.1/src/libgo/go/cmd/go/internal/lockedfile/internal/filelock/filelock_other.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/cmd/go/internal/lockedfile/internal/filelock/filelock_other.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/cmd/go/internal/lockedfile/internal/filelock/filelock_other.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,!plan9,!solaris,!windows
+// +build !aix,!darwin,!dragonfly,!freebsd,!hurd,!linux,!netbsd,!openbsd,!plan9,!solaris,!windows
package filelock
Index: gcc-9-9-20190125-2.1/src/libgo/go/runtime/signal_unix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/runtime/signal_unix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/runtime/signal_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 runtime
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/removeall_at.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/removeall_at.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/removeall_at.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 os
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/removeall_noat.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/removeall_noat.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/removeall_noat.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 os
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/error_posix.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/error_posix.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/error_posix.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 windows
+// +build aix darwin dragonfly freebsd hurd js,wasm linux nacl netbsd openbsd solaris windows
package os
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/socket_bsd.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/syscall/socket_bsd.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/socket_bsd.go
@@ -4,7 +4,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// +build darwin dragonfly freebsd openbsd netbsd
+// +build darwin dragonfly freebsd hurd openbsd netbsd
package syscall
[-- Attachment #3: add-hurd-to-libgo-test-headers.diff --]
[-- Type: text/x-patch, Size: 13565 bytes --]
libgo/ChangeLog
2019-01-28 Svante Signell <svante.signell@gmail.com>
* src/libgo/go/internal/poll/export_posix_test.go: Add +build hurd directive.
* src/libgo/go/runtime/export_unix_test.go: Likewise
* src/libgo/go/internal/poll/fd_posix_test.go: Likewise
* src/libgo/go/net/rawconn_unix_test.go: Likewise
2018-10-20 Svante Signell <svante.signell@gmail.com>
* libgo/go/.../*_test.go: Add +build hurd directive.
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/main_unix_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/main_unix_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/main_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 nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd linux nacl netbsd openbsd solaris
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/exec/lp_unix_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/exec/lp_unix_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/exec/lp_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 exec
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/os_unix_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/os_unix_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/os_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 os_test
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/signal/signal_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/signal/signal_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/signal/signal_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 signal
Index: gcc-9-9-20190125-2.1/src/libgo/go/runtime/crash_unix_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/runtime/crash_unix_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/runtime/crash_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 runtime_test
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/exec_unix_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/syscall/exec_unix_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/exec_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_test
@@ -15,6 +15,7 @@ import (
"syscall"
"testing"
"unsafe"
+ "runtime"
)
type command struct {
@@ -162,6 +163,9 @@ func TestPgid(t *testing.T) {
}
func TestForeground(t *testing.T) {
+ if runtime.GOOS == "hurd" {
+ t.Skip("skipping; TestForeground: fails on GNU/Hurd")
+ }
signal.Ignore(syscall.SIGTTIN, syscall.SIGTTOU)
tty, err := os.OpenFile("/dev/tty", os.O_RDWR, 0)
Index: gcc-9-9-20190125-2.1/src/libgo/go/runtime/runtime_unix_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/runtime/runtime_unix_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/runtime/runtime_unix_test.go
@@ -6,7 +6,7 @@
// We need a fast system call to provoke the race,
// and Close(-1) is nearly universally fast.
-// +build aix darwin dragonfly freebsd linux netbsd openbsd plan9
+// +build aix darwin dragonfly freebsd hurd linux netbsd openbsd plan9
package runtime_test
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/mmap_unix_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/syscall/mmap_unix_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/mmap_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
+// +build aix darwin dragonfly freebsd hurd linux netbsd openbsd
package syscall_test
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/addrselect_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/addrselect_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/addrselect_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 darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd hurd linux netbsd openbsd solaris
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/cgo_unix_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/cgo_unix_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/cgo_unix_test.go
@@ -3,7 +3,7 @@
// license that can be found in the LICENSE file.
// +build cgo,!netgo
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd linux netbsd openbsd solaris
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/conf_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/conf_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/conf_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 darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd hurd linux netbsd openbsd solaris
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/dnsconfig_unix_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/dnsconfig_unix_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/dnsconfig_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 net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/nss_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/nss_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/nss_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 darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd hurd linux netbsd openbsd solaris
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/cmd/go/go_unix_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/cmd/go/go_unix_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/cmd/go/go_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 darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd hurd linux netbsd openbsd solaris
package main_test
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/dial_unix_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/dial_unix_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/dial_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 net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/main_cloexec_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/main_cloexec_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/main_cloexec_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 dragonfly freebsd linux netbsd openbsd
+// +build dragonfly freebsd hurd linux netbsd openbsd
package net
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/dnsclient_unix_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/dnsclient_unix_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/dnsclient_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 net
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/env_unix_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/env_unix_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/env_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 os_test
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/error_unix_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/error_unix_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/error_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_test
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/export_posix_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/internal/poll/export_posix_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/export_posix_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 nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd hurd linux nacl netbsd openbsd solaris windows
// Export guts for testing on posix.
// Since testing imports os and os imports internal/poll,
Index: gcc-9-9-20190125-2.1/src/libgo/go/runtime/export_unix_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/runtime/export_unix_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/runtime/export_unix_test.go
@@ -1,8 +1,9 @@
+
// Copyright 2017 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.
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd hurd linux netbsd openbsd solaris
package runtime
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/fd_posix_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/internal/poll/fd_posix_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/fd_posix_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 nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd hurd linux nacl netbsd openbsd solaris windows
package poll_test
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/rawconn_unix_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/rawconn_unix_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/rawconn_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 net
[-- Attachment #4: debian_rules.patch.diff --]
[-- Type: text/x-patch, Size: 697 bytes --]
--- a/debian/rules.patch 2019-01-20 23:23:34.000000000 +0100
+++ b/debian/rules.patch 2019-01-20 22:15:26.000000000 +0100
@@ -201,6 +202,22 @@
debian_patches += hurd-changes
endif
+ifeq ($(DEB_TARGET_ARCH_OS),hurd)
+ debian_patches += \
+ src_libgo_build \
+ src_libgo_runtime \
+ src_libgo_go_crypto \
+ src_libgo_go_net \
+ src_libgo_go_os \
+ src_libgo_go_runtime \
+ src_libgo_go_syscall \
+ src_libgo_go_internal \
+ add-hurd-to-libgo-headers \
+ add-hurd-to-libgo-test-headers \
+ src_libgo_go_test \
+ src_libgo_testsuite_gotest
+endif
+
debian_patches += gcc-ice-dump
debian_patches += gcc-ice-apport
debian_patches += skip-bootstrap-multilib
[-- Attachment #5: src_libgo_build.diff --]
[-- Type: text/x-patch, Size: 10143 bytes --]
libgo/ChangeLog
2019-01-28 Svante Signell <svante.signell@gmail.com>
* configure.ac: Update to gcc-9
* Makefile.{am,in}: Likewise
* libgo/mksigtab.sh: Likewise
* libgo/mksysinfo.sh: Likewise
2018-10-10 Svante Signell <svante.signell@gmail.com>
* configure.ac: Add GOOS=hurd and LIBGO_IS_HURD.
* Makefile.{am,in}: Add runtime_getncpu_file = runtime/getncpu-hurd.c
* libgo/mksigtab.sh: Add SIGLOST, special treatment of SIGRT{MIN,MAX}.
* libgo/mksysinfo.sh: Special treatment of Errno, EWOULDBLOCK, _NSIG,
SYS_IOCTL, st_dev.
Index: gcc-9-9-20190125-2.1/src/libgo/configure.ac
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/configure.ac
+++ gcc-9-9-20190125-2.1/src/libgo/configure.ac
@@ -165,6 +165,7 @@ is_dragonfly=no
is_rtems=no
is_solaris=no
is_aix=no
+is_gnu=no
GOOS=unknown
case ${host} in
*-*-darwin*) is_darwin=yes; GOOS=darwin ;;
@@ -177,6 +178,7 @@ case ${host} in
*-*-rtems*) is_rtems=yes; GOOS=rtems ;;
*-*-solaris2*) is_solaris=yes; GOOS=solaris ;;
*-*-aix*) is_aix=yes; GOOS=aix ;;
+ *-*-gnu*) is_gnu=yes; GOOS=hurd ;;
esac
AM_CONDITIONAL(LIBGO_IS_DARWIN, test $is_darwin = yes)
AM_CONDITIONAL(LIBGO_IS_FREEBSD, test $is_freebsd = yes)
@@ -188,6 +190,7 @@ AM_CONDITIONAL(LIBGO_IS_DRAGONFLY, test
AM_CONDITIONAL(LIBGO_IS_RTEMS, test $is_rtems = yes)
AM_CONDITIONAL(LIBGO_IS_SOLARIS, test $is_solaris = yes)
AM_CONDITIONAL(LIBGO_IS_AIX, test $is_aix = yes)
+AM_CONDITIONAL(LIBGO_IS_HURD, test $is_gnu = yes)
AM_CONDITIONAL(LIBGO_IS_BSD, test $is_darwin = yes -o $is_dragonfly = yes -o $is_freebsd = yes -o $is_netbsd = yes -o $is_openbsd = yes)
AC_SUBST(GOOS)
AC_SUBST(ALLGOOS)
Index: gcc-9-9-20190125-2.1/src/libgo/Makefile.am
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/Makefile.am
+++ gcc-9-9-20190125-2.1/src/libgo/Makefile.am
@@ -429,10 +429,14 @@ else
if LIBGO_IS_AIX
runtime_getncpu_file = runtime/getncpu-aix.c
else
+if LIBGO_IS_HURD
+runtime_getncpu_file = runtime/getncpu-hurd.c
+else
runtime_getncpu_file = runtime/getncpu-none.c
endif
endif
endif
+endif
endif
endif
endif
Index: gcc-9-9-20190125-2.1/src/libgo/Makefile.in
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/Makefile.in
+++ gcc-9-9-20190125-2.1/src/libgo/Makefile.in
@@ -230,7 +230,8 @@ am__DEPENDENCIES_4 = $(am__DEPENDENCIES_
libgo_llgo_la_DEPENDENCIES = $(am__DEPENDENCIES_4)
@LIBGO_IS_RTEMS_TRUE@am__objects_1 = \
@LIBGO_IS_RTEMS_TRUE@ runtime/rtems-task-variable-add.lo
-@LIBGO_IS_AIX_FALSE@@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@am__objects_2 = runtime/getncpu-none.lo
+@LIBGO_IS_AIX_FALSE@@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_HURD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@am__objects_2 = runtime/getncpu-none.lo
+@LIBGO_IS_AIX_FALSE@@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_HURD_TRUE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@am__objects_2 = runtime/getncpu-hurd.lo
@LIBGO_IS_AIX_TRUE@@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@am__objects_2 = runtime/getncpu-aix.lo
@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_TRUE@@LIBGO_IS_SOLARIS_FALSE@am__objects_2 = runtime/getncpu-bsd.lo
@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_TRUE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@am__objects_2 = runtime/getncpu-bsd.lo
@@ -856,7 +857,8 @@ noinst_DATA = internal/x/net/internal/ne
zdefaultcc.go
@LIBGO_IS_RTEMS_FALSE@rtems_task_variable_add_file =
@LIBGO_IS_RTEMS_TRUE@rtems_task_variable_add_file = runtime/rtems-task-variable-add.c
-@LIBGO_IS_AIX_FALSE@@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@runtime_getncpu_file = runtime/getncpu-none.c
+@LIBGO_IS_AIX_FALSE@@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_HURD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@runtime_getncpu_file = runtime/getncpu-none.c
+@LIBGO_IS_AIX_FALSE@@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_HURD_TRUE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@runtime_getncpu_file = runtime/getncpu-hurd.c
@LIBGO_IS_AIX_TRUE@@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@runtime_getncpu_file = runtime/getncpu-aix.c
@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_TRUE@@LIBGO_IS_SOLARIS_FALSE@runtime_getncpu_file = runtime/getncpu-bsd.c
@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_TRUE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@runtime_getncpu_file = runtime/getncpu-bsd.c
@@ -1391,6 +1393,8 @@ runtime/rtems-task-variable-add.lo: runt
runtime/$(DEPDIR)/$(am__dirstamp)
runtime/getncpu-none.lo: runtime/$(am__dirstamp) \
runtime/$(DEPDIR)/$(am__dirstamp)
+runtime/getncpu-hurd.lo: runtime/$(am__dirstamp) \
+ runtime/$(DEPDIR)/$(am__dirstamp)
runtime/getncpu-aix.lo: runtime/$(am__dirstamp) \
runtime/$(DEPDIR)/$(am__dirstamp)
runtime/getncpu-bsd.lo: runtime/$(am__dirstamp) \
@@ -1420,6 +1424,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/env_posix.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/getncpu-aix.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/getncpu-bsd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/getncpu-hurd.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/getncpu-irix.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/getncpu-linux.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/getncpu-none.Plo@am__quote@
Index: gcc-9-9-20190125-2.1/src/libgo/mksigtab.sh
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/mksigtab.sh
+++ gcc-9-9-20190125-2.1/src/libgo/mksigtab.sh
@@ -91,6 +91,7 @@ checksig _SIGCANCEL '{_SigSetStack + _S
checksig _SIGXRES '{_SigNotify, "SIGXRES: resource control exceeded"}'
checksig _SIGJVM1 '{_SigNotify, "SIGJVM1: reserved signal for Java Virtual Machine"}'
checksig _SIGJVM2 '{_SigNotify, "SIGJVM2: reserved signal for Java Virtual Machine"}'
+checksig _SIGLOST ' {_SigNotify, "SIGLOST: resource lost (Sun); server died (GNU)"}'
# Special handling of signals 32 and 33 on GNU/Linux systems,
# because they are special to glibc.
@@ -112,6 +113,11 @@ else
rtmax=`grep 'const _*SIGRTMAX = [0-9]*$' gen-sysinfo.go | sed -e 's/.* = \([0-9]*\)/\1/'`
if test -n "$rtmax"; then
nsig=`expr $rtmax + 1`
+ elif grep 'const _*SIGRTMAX = [ (]*_*SIGRTMIN[ )]*' gen-sysinfo.go >/dev/null 2>&1; then
+ rtmin=`grep 'const _*SIGRTMIN = [0-9]*$' gen-sysinfo.go | sed -e 's/.* = \([0-9]*\)/\1/'`
+ if test -n "$rtmin"; then
+ nsig=`expr $rtmin + 1`
+ fi
fi
fi
fi
Index: gcc-9-9-20190125-2.1/src/libgo/mksysinfo.sh
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/mksysinfo.sh
+++ gcc-9-9-20190125-2.1/src/libgo/mksysinfo.sh
@@ -55,8 +55,33 @@ grep '^type _mld_hdr_t ' gen-sysinfo.go
sed -e 's/_in6_addr/[16]byte/' >> ${OUT}
# The errno constants. These get type Errno.
- egrep '#define E[A-Z0-9_]+ ' errno.i | \
- sed -e 's/^#define \(E[A-Z0-9_]*\) .*$/const \1 = Errno(_\1)/' >> ${OUT}
+# egrep '#define E[A-Z0-9_]+ ' errno.i | \
+# sed -e 's/^#define \(E[A-Z0-9_]*\) .*$/const \1 = Errno(_\1)/' >> ${OUT}
+
+egrep '#define E[A-Z0-9_]+ [0-9]' errno.i | \
+ sed -e 's/^#define \(E[A-Z0-9_]*\) .*$/const \1 = Errno(_\1)/' >> ${OUT}
+# Workaround for GNU/Hurd _EMIG_* errors having negative values
+egrep '#define E[A-Z0-9_]+ -[0-9]' errno.i | \
+ sed -e 's/^#define \(E[A-Z0-9_]*\) .*$/const \1 = Errno(-_\1)/' >> ${OUT}
+
+# Special treatment of EWOULDBLOCK for GNU/Hurd
+# /usr/include/i386-gnu/bits/errno.h: #define EWOULDBLOCK EAGAIN
+if egrep '^const _EWOULDBLOCK = _EAGAIN' gen-sysinfo.go > /dev/null 2>&1; then
+ if egrep '^const EAGAIN = Errno\(_EAGAIN\)' ${OUT} > /dev/null 2>&1 ; then
+ echo 'const EWOULDBLOCK = Errno(_EAGAIN)' >> ${OUT}
+ fi
+fi
+
+# Special treatment of _NSIG for GNU/Hurd
+# /usr/include/i386-gnu/bits/signum-generic.h:
+#define __SIGRTMIN 32
+#define __SIGRTMAX __SIGRTMIN
+#define _NSIG (__SIGRTMAX + 1)
+# Brute force method (mksigtab.sh bug):
+#if egrep '^const ___SIGRTMAX = ___SIGRTMIN' gen-sysinfo.go > /dev/null 2>&1; then
+# egrep '^const ___SIGRTMIN = 32' gen-sysinfo.go > /dev/null 2>&1 | \
+# echo "const __SIGRTMAX = 32" >> gen-sysinfo.go
+#fi
# The O_xxx flags.
egrep '^const _(O|F|FD)_' gen-sysinfo.go | \
@@ -130,6 +155,11 @@ grep '^const _SYS_' gen-sysinfo.go | \
echo "const $sup = _$sys" >> ${OUT}
done
+# Special treatment of SYS_IOCTL for GNU/Hurd
+if ! grep '^const SYS_IOCTL' ${OUT} > /dev/null 2>&1; then
+ echo "const SYS_IOCTL = 0" >> ${OUT}
+fi
+
# The GNU/Linux support wants to use SYS_GETDENTS64 if available.
if ! grep '^const SYS_GETDENTS ' ${OUT} >/dev/null 2>&1; then
echo "const SYS_GETDENTS = 0" >> ${OUT}
@@ -477,6 +507,11 @@ grep '^type _st_timespec ' gen-sysinfo.g
# The stat type.
# Prefer largefile variant if available.
+# Special treatment of st_dev for GNU/Hurd
+# /usr/include/i386-gnu/bits/stat.h: #define st_dev st_fsid
+if grep 'define st_dev st_fsid' gen-sysinfo.go > /dev/null 2>&1; then
+ sed -i -e 's/; st_fsid/; st_dev/' gen-sysinfo.go
+fi
stat=`grep '^type _stat64 ' gen-sysinfo.go || true`
if test "$stat" != ""; then
grep '^type _stat64 ' gen-sysinfo.go
[-- Attachment #6: src_libgo_go_crypto.diff --]
[-- Type: text/x-patch, Size: 807 bytes --]
libgo/ChangeLog
2018-10-11 Svante Signell <svante.signell@gmail.com>
* libgo/go/crypto/x509/root_hurd.go: New file, derived from root_linux.go,
add possible certification files.
Index: gcc-9-9-20190125-2.1/src/libgo/go/crypto/x509/root_hurd.go
===================================================================
--- /dev/null
+++ gcc-9-9-20190125-2.1/src/libgo/go/crypto/x509/root_hurd.go
@@ -0,0 +1,11 @@
+// Copyright 2015 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.
+// This file is derived from root_linux.go
+
+package x509
+
+// Possible certificate files; stop after finding one.
+var certFiles = []string{
+ "/etc/ssl/certs/ca-certificates.crt", // Debian/Ubuntu/Gentoo etc.
+}
[-- Attachment #7: src_libgo_go_internal.diff --]
[-- Type: text/x-patch, Size: 669 bytes --]
libgo/ChangeLog
2019-01-28 Svante Signell <svante.signell@gmail.com>
* ibgo/go/internal/syscall/unix/at_sysnum_hurd.go: New file, derived from at_sysnum_linux.go.
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/syscall/unix/at_sysnum_hurd.go
===================================================================
--- /dev/null
+++ gcc-9-9-20190125-2.1/src/libgo/go/internal/syscall/unix/at_sysnum_hurd.go
@@ -0,0 +1,8 @@
+// Copyright 2018 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.
+
+package unix
+
+const AT_REMOVEDIR = 0x200
+const AT_SYMLINK_NOFOLLOW = 0x100
[-- Attachment #8: src_libgo_go_net.diff --]
[-- Type: text/x-patch, Size: 8987 bytes --]
libgo/ChangeLog
2019-01-28 Svante Signell <svante.signell@gmail.com>
* libgo/go/net/sendfile_glibc.go: Rename sendfile_linux.go, add +build hurd linux
* libgo/go/net/sock_hurd.go: Remove, add +build hurd directive to sock_posix.go
* libgo/go/net/sockopt_posix.go: Add +build hurd directive to sockopt_posix.go
* libgo/go/net/sockopt_hurd.go: New file derived from sockopt_{bsd,linux}.go.
* libgo/go/net/sockoptip_hurd.go: Remove, add +build hurd directive to sockoptip_bsdvar.go
* libgo/go/internal/poll/sendfile_glibc.go: Rename sendfile_linux.go, add +build hurd linux
2018-10-11 Svante Signell <svante.signell@gmail.com>
* libgo/go/net/cgo_hurd.go: New file, derived from cgo_bsd.go.
* libgo/go/net/sendfile_hurd.go: New file, identical to sendfile_linux.go.
* libgo/go/net/sock_hurd.go: New file, identical to sock_linux.go.
* libgo/go/net/sockopt_hurd.go: New file, identical to sockopt_linux.go.
* libgo/go/net/sockoptip_hurd.go: New file, identical to sockoptip_bsd.go.
* libgo/go/internal/poll/sendfile_hurd.go: New file, derived from sendfile_linux.go.
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/cgo_hurd.go
===================================================================
--- /dev/null
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/cgo_hurd.go
@@ -0,0 +1,17 @@
+// Copyright 2011 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.
+// This file is derived from cgo_bsd.go
+
+// +build cgo,!netgo
+// +build hurd
+
+package net
+
+/*
+#include <netdb.h>
+*/
+
+import "syscall"
+
+const cgoAddrInfoFlags = syscall.AI_CANONNAME | syscall.AI_V4MAPPED | syscall.AI_ALL
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/sendfile_linux.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/net/sendfile_linux.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2011 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.
-
-package net
-
-import (
- "internal/poll"
- "io"
- "os"
-)
-
-// sendFile copies the contents of r to c using the sendfile
-// system call to minimize copies.
-//
-// if handled == true, sendFile returns the number of bytes copied and any
-// non-EOF error.
-//
-// if handled == false, sendFile performed no work.
-func sendFile(c *netFD, r io.Reader) (written int64, err error, handled bool) {
- var remain int64 = 1 << 62 // by default, copy until EOF
-
- lr, ok := r.(*io.LimitedReader)
- if ok {
- remain, r = lr.N, lr.R
- if remain <= 0 {
- return 0, nil, true
- }
- }
- f, ok := r.(*os.File)
- if !ok {
- return 0, nil, false
- }
-
- sc, err := f.SyscallConn()
- if err != nil {
- return 0, nil, false
- }
-
- var werr error
- err = sc.Read(func(fd uintptr) bool {
- written, werr = poll.SendFile(&c.pfd, int(fd), remain)
- return true
- })
- if werr == nil {
- werr = err
- }
-
- if lr != nil {
- lr.N = remain - written
- }
- return written, wrapSyscallError("sendfile", err), written > 0
-}
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/sendfile_glibc.go
===================================================================
--- /dev/null
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/sendfile_glibc.go
@@ -0,0 +1,55 @@
+// Copyright 2011 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.
+
+// +build hurd linux
+
+package net
+
+import (
+ "internal/poll"
+ "io"
+ "os"
+)
+
+// sendFile copies the contents of r to c using the sendfile
+// system call to minimize copies.
+//
+// if handled == true, sendFile returns the number of bytes copied and any
+// non-EOF error.
+//
+// if handled == false, sendFile performed no work.
+func sendFile(c *netFD, r io.Reader) (written int64, err error, handled bool) {
+ var remain int64 = 1 << 62 // by default, copy until EOF
+
+ lr, ok := r.(*io.LimitedReader)
+ if ok {
+ remain, r = lr.N, lr.R
+ if remain <= 0 {
+ return 0, nil, true
+ }
+ }
+ f, ok := r.(*os.File)
+ if !ok {
+ return 0, nil, false
+ }
+
+ sc, err := f.SyscallConn()
+ if err != nil {
+ return 0, nil, false
+ }
+
+ var werr error
+ err = sc.Read(func(fd uintptr) bool {
+ written, werr = poll.SendFile(&c.pfd, int(fd), remain)
+ return true
+ })
+ if werr == nil {
+ werr = err
+ }
+
+ if lr != nil {
+ lr.N = remain - written
+ }
+ return written, wrapSyscallError("sendfile", err), written > 0
+}
Index: gcc-9-9-20190125-2.1/src/libgo/go/net/sockopt_hurd.go
===================================================================
--- /dev/null
+++ gcc-9-9-20190125-2.1/src/libgo/go/net/sockopt_hurd.go
@@ -0,0 +1,41 @@
+// Copyright 2019 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.
+
+package net
+
+import (
+ "os"
+ "syscall"
+)
+
+func setDefaultSockopts(s, family, sotype int, ipv6only bool) error {
+ if family == syscall.AF_INET6 && sotype != syscall.SOCK_RAW {
+ // Allow both IP versions even if the OS default
+ // is otherwise. Note that some operating systems
+ // never admit this option.
+ syscall.SetsockoptInt(s, syscall.IPPROTO_IPV6, syscall.IPV6_V6ONLY, boolint(ipv6only))
+ }
+ // Allow broadcast.
+ if err := syscall.SetsockoptInt(s, syscall.SOL_SOCKET, syscall.SO_BROADCAST, 1); err != nil {
+ return os.NewSyscallError("setsockopt", err)
+ }
+ return nil
+}
+
+func setDefaultListenerSockopts(s int) error {
+ // Allow reuse of recently-used addresses.
+ if err := syscall.SetsockoptInt(s, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1); err != nil {
+ return os.NewSyscallError("setsockopt", err)
+ }
+ return nil
+}
+
+func setDefaultMulticastSockopts(s int) error {
+ // Allow multicast UDP and raw IP datagram sockets to listen
+ // concurrently across multiple listeners.
+ if err := syscall.SetsockoptInt(s, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1); err != nil {
+ return os.NewSyscallError("setsockopt", err)
+ }
+ return nil
+}
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/sendfile_linux.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/internal/poll/sendfile_linux.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2011 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.
-
-package poll
-
-import "syscall"
-
-// maxSendfileSize is the largest chunk size we ask the kernel to copy
-// at a time.
-const maxSendfileSize int = 4 << 20
-
-// SendFile wraps the sendfile system call.
-func SendFile(dstFD *FD, src int, remain int64) (int64, error) {
- if err := dstFD.writeLock(); err != nil {
- return 0, err
- }
- defer dstFD.writeUnlock()
-
- dst := int(dstFD.Sysfd)
- var written int64
- var err error
- for remain > 0 {
- n := maxSendfileSize
- if int64(n) > remain {
- n = int(remain)
- }
- n, err1 := syscall.Sendfile(dst, src, nil, n)
- if n > 0 {
- written += int64(n)
- remain -= int64(n)
- } else if n == 0 && err1 == nil {
- break
- }
- if err1 == syscall.EAGAIN {
- if err1 = dstFD.pd.waitWrite(dstFD.isFile); err1 == nil {
- continue
- }
- }
- if err1 != nil {
- // This includes syscall.ENOSYS (no kernel
- // support) and syscall.EINVAL (fd types which
- // don't implement sendfile)
- err = err1
- break
- }
- }
- return written, err
-}
Index: gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/sendfile_glibc.go
===================================================================
--- /dev/null
+++ gcc-9-9-20190125-2.1/src/libgo/go/internal/poll/sendfile_glibc.go
@@ -0,0 +1,51 @@
+// Copyright 2011 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.
+
+// +build hurd linux
+
+package poll
+
+import "syscall"
+
+// maxSendfileSize is the largest chunk size we ask the kernel to copy
+// at a time.
+const maxSendfileSize int = 4 << 20
+
+// SendFile wraps the sendfile system call.
+func SendFile(dstFD *FD, src int, remain int64) (int64, error) {
+ if err := dstFD.writeLock(); err != nil {
+ return 0, err
+ }
+ defer dstFD.writeUnlock()
+
+ dst := int(dstFD.Sysfd)
+ var written int64
+ var err error
+ for remain > 0 {
+ n := maxSendfileSize
+ if int64(n) > remain {
+ n = int(remain)
+ }
+ n, err1 := syscall.Sendfile(dst, src, nil, n)
+ if n > 0 {
+ written += int64(n)
+ remain -= int64(n)
+ } else if n == 0 && err1 == nil {
+ break
+ }
+ if err1 == syscall.EAGAIN {
+ if err1 = dstFD.pd.waitWrite(dstFD.isFile); err1 == nil {
+ continue
+ }
+ }
+ if err1 != nil {
+ // This includes syscall.ENOSYS (no kernel
+ // support) and syscall.EINVAL (fd types which
+ // don't implement sendfile)
+ err = err1
+ break
+ }
+ }
+ return written, err
+}
[-- Attachment #9: src_libgo_go_os.diff --]
[-- Type: text/x-patch, Size: 3449 bytes --]
libgo/ChangeLog
2019-01-28 Svante Signell <svante.signell@gmail.com>
* libgo/go/os/pipe_glibc.go: Rename pipe_linux.go, add +build hurd linux
2018-10-19 Svante Signell <svante.signell@gmail.com>
* libgo/go/os/executable_procfs.go: Add hurd to switch statement.
* libgo/go/os/pipe_hurd.go: New file, derived from pipe_linux.go.
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/executable_procfs.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/executable_procfs.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/executable_procfs.go
@@ -19,7 +19,7 @@ var executablePath, executablePathErr =
switch runtime.GOOS {
default:
return "", errors.New("Executable not implemented for " + runtime.GOOS)
- case "linux", "android":
+ case "hurd", "linux", "android":
procfn = "/proc/self/exe"
case "netbsd":
procfn = "/proc/curproc/exe"
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/pipe_linux.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/pipe_linux.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2013 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.
-
-package os
-
-import "syscall"
-
-// Pipe returns a connected pair of Files; reads from r return bytes written to w.
-// It returns the files and an error, if any.
-func Pipe() (r *File, w *File, err error) {
- var p [2]int
-
- e := syscall.Pipe2(p[0:], syscall.O_CLOEXEC)
- // pipe2 was added in 2.6.27 and our minimum requirement is 2.6.23, so it
- // might not be implemented.
- if e == syscall.ENOSYS {
- // See ../syscall/exec.go for description of lock.
- syscall.ForkLock.RLock()
- e = syscall.Pipe(p[0:])
- if e != nil {
- syscall.ForkLock.RUnlock()
- return nil, nil, NewSyscallError("pipe", e)
- }
- syscall.CloseOnExec(p[0])
- syscall.CloseOnExec(p[1])
- syscall.ForkLock.RUnlock()
- } else if e != nil {
- return nil, nil, NewSyscallError("pipe2", e)
- }
-
- return newFile(uintptr(p[0]), "|0", kindPipe), newFile(uintptr(p[1]), "|1", kindPipe), nil
-}
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/pipe_glibc.go
===================================================================
--- /dev/null
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/pipe_glibc.go
@@ -0,0 +1,35 @@
+// Copyright 2013 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.
+
+// +build hurd linux
+
+package os
+
+import "syscall"
+
+// Pipe returns a connected pair of Files; reads from r return bytes written to w.
+// It returns the files and an error, if any.
+func Pipe() (r *File, w *File, err error) {
+ var p [2]int
+
+ e := syscall.Pipe2(p[0:], syscall.O_CLOEXEC)
+ // pipe2 was added in 2.6.27 and our minimum requirement is 2.6.23, so it
+ // might not be implemented.
+ if e == syscall.ENOSYS {
+ // See ../syscall/exec.go for description of lock.
+ syscall.ForkLock.RLock()
+ e = syscall.Pipe(p[0:])
+ if e != nil {
+ syscall.ForkLock.RUnlock()
+ return nil, nil, NewSyscallError("pipe", e)
+ }
+ syscall.CloseOnExec(p[0])
+ syscall.CloseOnExec(p[1])
+ syscall.ForkLock.RUnlock()
+ } else if e != nil {
+ return nil, nil, NewSyscallError("pipe2", e)
+ }
+
+ return newFile(uintptr(p[0]), "|0", kindPipe), newFile(uintptr(p[1]), "|1", kindPipe), nil
+}
[-- Attachment #10: src_libgo_go_runtime.diff --]
[-- Type: text/x-patch, Size: 9628 bytes --]
libgo/ChangeLog
2019-01-28 Svante Signell <svante.signell@gmail.com>
* libgo/go/runtime/netpoll.go: Update code path as with AIX.
* libgo/go/runtime/netpoll_hurd.go: Update code according to netpoll_aix.go.
2018-10-19 Svante Signell <svante.signell@gmail.com>
* libgo/go/runtime/netpoll_hurd.go: New file, implement poll, libc_pipe2,
netpollinit, netpolldescriptor, fdadd, netpollopen, fdremove, netpollclose,
netpollarm, netpoll.
* libgo/go/runtime/os_hurd.go: New file, derived from os_solaris.go.
Use struct __semaphore sem_t instead of semt.
Index: gcc-9-9-20190125-2.1/src/libgo/go/runtime/netpoll.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/runtime/netpoll.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/runtime/netpoll.go
@@ -102,7 +102,7 @@ func netpollinited() bool {
// descriptor being used by netpoll.
func poll_runtime_isPollServerDescriptor(fd uintptr) bool {
fds := netpolldescriptor()
- if GOOS != "aix" {
+ if GOOS != "aix" && GOOS != "hurd" {
return fd == fds
} else {
// AIX have a pipe in its netpoll implementation.
@@ -178,8 +178,8 @@ func poll_runtime_pollWait(pd *pollDesc,
if err != 0 {
return err
}
- // As for now only Solaris and AIX use level-triggered IO.
- if GOOS == "solaris" || GOOS == "aix" {
+ // As for now only Solaris, AIX and Hurd use level-triggered IO.
+ if GOOS == "solaris" || GOOS == "aix" || GOOS == "hurd" {
netpollarm(pd, mode)
}
for !netpollblock(pd, int32(mode), false) {
Index: gcc-9-9-20190125-2.1/src/libgo/go/runtime/netpoll_hurd.go
===================================================================
--- /dev/null
+++ gcc-9-9-20190125-2.1/src/libgo/go/runtime/netpoll_hurd.go
@@ -0,0 +1,240 @@
+// Copyright 2019 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.
+
+package runtime
+
+import "unsafe"
+
+// FIXME: Improve network poller for hurd.
+// This is based on the former libgo/runtime/netpoll_select.c implementation
+// except that it uses poll instead of select and is written in Go.
+// It's also based on Solaris implementation for the arming mechanisms
+// Inspiration was also taken from netpoll_aix.go and netpoll_solaris.go
+
+//From /usr/include/x86_64-linux-gnu/sys/poll.h
+//go:noescape
+//extern poll
+func libc_poll(pfds *pollfd, nfds int32, timeout int32) int32
+
+//go:noescape
+//extern pipe2
+func libc_pipe2(fd *int32, flags int32) int32
+
+//pollfd represents the poll structure for GNU/Hurd operating system.
+type pollfd struct {
+ fd int32 // File descriptor to poll.
+ events int16 // Types of events poller cares about.
+ revents int16 // Types of events that actually occurred.
+}
+
+//From /usr/include/i386-gnu/bits/poll.h
+const _POLLIN = 01 // There is data to read.
+const _POLLPRI = 02 // There is urgent data to read.
+const _POLLOUT = 04 // Writing now will not block.
+const _POLLERR = 010 // Error condition.
+const _POLLHUP = 020 // Hung up.
+const _POLLNVAL = 040 // Invalid polling request.
+
+var (
+ pfds []pollfd
+ pds []*pollDesc
+ mtxpoll mutex
+ mtxset mutex
+ rdwake int32
+ wrwake int32
+ pendingUpdates int32
+)
+
+const pollVerbose = false
+
+func netpollinit() {
+ var p [2]int32
+
+ // Create the pipe we use to wakeup poll.
+ if err := libc_pipe2(&p[0], _O_CLOEXEC|_O_NONBLOCK); err < 0 {
+ throw("runtime:netpollinit(): failed to create pipe2")
+ }
+ rdwake = p[0]
+ wrwake = p[1]
+
+ // Pre-allocate array of pollfd structures for poll.
+ if pollVerbose {
+ println("*** allocating")
+ }
+ pfds = make([]pollfd, 1, 128)
+ if pollVerbose {
+ println("*** allocating done", &pfds[0])
+ }
+
+ // Poll the read side of the pipe.
+ pfds[0].fd = int32(rdwake)
+ pfds[0].events = int16(_POLLIN)
+ pfds[0].revents = int16(0)
+
+ pds = make([]*pollDesc, 1, 128)
+// Checks for pd != nil are made in netpoll()
+ pds[0] = nil
+}
+
+func netpolldescriptor() uintptr {
+ // Both fd must be returned
+ if rdwake > 0xFFFF || wrwake > 0xFFFF {
+ throw("netpolldescriptor: invalid fd number")
+ }
+ return uintptr(rdwake<<16 | wrwake)
+}
+
+// netpollwakeup writes on wrwake to wakeup poll before any changes.
+func netpollwakeup() {
+ if pendingUpdates == 0 {
+ pendingUpdates = 1
+ if pollVerbose {
+ println("*** writing 1 byte")
+ }
+ b := [1]byte{0}
+ write(uintptr(wrwake), unsafe.Pointer(&b[0]), 1)
+ }
+}
+
+func netpollopen(fd uintptr, pd *pollDesc) int32 {
+ if pollVerbose {
+ println("*** netpollopen", fd)
+ }
+ lock(&mtxpoll)
+ netpollwakeup()
+
+ lock(&mtxset)
+ unlock(&mtxpoll)
+
+ pd.user = uint32(len(pfds))
+ pfds = append(pfds, pollfd{fd: int32(fd)})
+ pds = append(pds, pd)
+ unlock(&mtxset)
+ return 0
+}
+
+func netpollclose(fd uintptr) int32 {
+ if pollVerbose {
+ println("*** netpollclose", fd)
+ }
+ lock(&mtxpoll)
+ netpollwakeup()
+
+ lock(&mtxset)
+ unlock(&mtxpoll)
+
+ for i := 0; i < len(pfds); i++ {
+ if pfds[i].fd == int32(fd) {
+ pfds[i] = pfds[len(pfds)-1]
+ pfds = pfds[:len(pfds)-1]
+
+ pds[i] = pds[len(pds)-1]
+ pds[i].user = uint32(i)
+ pds = pds[:len(pds)-1]
+ break
+ }
+ }
+ unlock(&mtxset)
+ return 0
+}
+
+func netpollarm(pd *pollDesc, mode int) {
+ if pollVerbose {
+ println("*** netpollarm", pd.fd, mode)
+ }
+ lock(&mtxpoll)
+ netpollwakeup()
+
+ lock(&mtxset)
+ unlock(&mtxpoll)
+
+ switch mode {
+ case 'r':
+ pfds[pd.user].events |= _POLLIN
+ case 'w':
+ pfds[pd.user].events |= _POLLOUT
+ }
+ unlock(&mtxset)
+}
+
+// polls for ready network connections
+// returns list of goroutines that become runnable
+//go:nowritebarrierrec
+func netpoll(block bool) gList {
+ timeout := int32(0)
+ if !block {
+ timeout = 0
+ return gList{}
+ }
+ if pollVerbose {
+ println("*** netpoll", block)
+ }
+retry:
+ lock(&mtxpoll)
+ lock(&mtxset)
+ pendingUpdates = 0
+ unlock(&mtxpoll)
+
+ if pollVerbose {
+ println("*** netpoll before poll")
+ }
+ n := libc_poll(&pfds[0], int32(len(pfds)), timeout)
+ if pollVerbose {
+ println("*** netpoll after poll", n)
+ }
+ if n < 0 {
+ e := errno()
+ if e != _EINTR {
+ println("errno=", e, " len(pfds)=", len(pfds))
+ throw("poll failed")
+ }
+ if pollVerbose {
+ println("*** poll failed")
+ }
+ unlock(&mtxset)
+ goto retry
+ }
+ // Check if some descriptors need to be changed
+ if n != 0 && pfds[0].revents&(_POLLIN|_POLLHUP|_POLLERR) != 0 {
+ var b [1]byte
+ for read(rdwake, unsafe.Pointer(&b[0]), 1) == 1 {
+ if pollVerbose {
+ println("*** read 1 byte from pipe")
+ }
+ }
+ // Do not look at the other fds in this case as the mode may have changed
+ // XXX only additions of flags are made, so maybe it is ok
+ unlock(&mtxset)
+ goto retry
+ }
+ var toRun gList
+ for i := 0; i < len(pfds) && n > 0; i++ {
+ pfd := &pfds[i]
+
+ var mode int32
+ if pfd.revents&(_POLLIN|_POLLHUP|_POLLERR) != 0 {
+ mode += 'r'
+ pfd.events &= ^_POLLIN
+ }
+ if pfd.revents&(_POLLOUT|_POLLHUP|_POLLERR) != 0 {
+ mode += 'w'
+ pfd.events &= ^_POLLOUT
+ }
+ if mode != 0 {
+ if pollVerbose {
+ println("*** netpollready i=", i, "revents=", pfd.revents, "events=", pfd.events, "pd=", pds[i])
+ }
+ netpollready(&toRun, pds[i], mode)
+ n--
+ }
+ }
+ unlock(&mtxset)
+ if block && toRun.empty() {
+ goto retry
+ }
+ if pollVerbose {
+ println("*** netpoll returning end")
+ }
+ return toRun
+}
Index: gcc-9-9-20190125-2.1/src/libgo/go/runtime/os_hurd.go
===================================================================
--- /dev/null
+++ gcc-9-9-20190125-2.1/src/libgo/go/runtime/os_hurd.go
@@ -0,0 +1,87 @@
+// Copyright 2011 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.
+// This file is derived from os_solaris.go
+
+package runtime
+
+import "unsafe"
+
+type mOS struct {
+ waitsema uintptr // semaphore for parking on locks
+}
+
+//extern malloc
+func libc_malloc(uintptr) unsafe.Pointer
+
+//go:noescape
+//extern sem_init
+func sem_init(sem *_sem_t, pshared int32, value uint32) int32
+
+//go:noescape
+//extern sem_wait
+func sem_wait(sem *_sem_t) int32
+
+//go:noescape
+//extern sem_post
+func sem_post(sem *_sem_t) int32
+
+//go:noescape
+//extern sem_timedwait
+func sem_timedwait(sem *_sem_t, timeout *timespec) int32
+
+//go:nosplit
+func semacreate(mp *m) {
+ if mp.mos.waitsema != 0 {
+ return
+ }
+
+ var sem *_sem_t
+
+ // Call libc's malloc rather than malloc. This will
+ // allocate space on the C heap. We can't call malloc
+ // here because it could cause a deadlock.
+ sem = (*_sem_t)(libc_malloc(unsafe.Sizeof(*sem)))
+ if sem_init(sem, 0, 0) != 0 {
+ throw("sem_init")
+ }
+ mp.mos.waitsema = uintptr(unsafe.Pointer(sem))
+}
+
+//go:nosplit
+func semasleep(ns int64) int32 {
+ _m_ := getg().m
+ if ns >= 0 {
+ var ts timespec
+ ts.set_sec(ns / 1000000000)
+ ts.set_nsec(int32(ns % 1000000000))
+
+ if sem_timedwait((*_sem_t)(unsafe.Pointer(_m_.mos.waitsema)), &ts) != 0 {
+ err := errno()
+ if err == _ETIMEDOUT || err == _EAGAIN || err == _EINTR {
+ return -1
+ }
+ throw("sem_timedwait")
+ }
+ return 0
+ }
+ for {
+ r1 := sem_wait((*_sem_t)(unsafe.Pointer(_m_.mos.waitsema)))
+ if r1 == 0 {
+ break
+ }
+ if errno() == _EINTR {
+ continue
+ }
+ throw("sem_wait")
+ }
+ return 0
+}
+
+//go:nosplit
+func semawakeup(mp *m) {
+ if sem_post((*_sem_t)(unsafe.Pointer(mp.mos.waitsema))) != 0 {
+ throw("sem_post")
+ }
+}
+
[-- Attachment #11: src_libgo_go_syscall.diff --]
[-- Type: text/x-patch, Size: 33116 bytes --]
libgo/ChangeLog
2019-01-28 Svante Signell <svante.signell@gmail.com>
* libgo/go/syscall/errstr_glibc.go: Rename errstr_linux.go, add +build hurd linux.
* libgo/go/syscall/socket_hurd.go: Remove, add +build hurd to socket_bsd.go.
* libgo/go/syscall/exec_hurd.go: New file, derived from exec_unix.go.
* libgo/go/syscall/syscall_glibc.go: Rename syscall_linux.go, add +build hurd linux.
2018-10-19 Svante Signell <svante.signell@gmail.com>
* libgo/go/syscall/errstr_hurd.go: New file, derived from errstr_linux.go.
* libgo/go/syscall/libcall_hurd_386.go: New file, derived from
libcall_linux_386.go. Remove Iopl, iopl.
* libgo/go/syscall/libcall_hurd.go: New file, derived from libcall_linux.go.
Dummy function: raw_ptrace.
Removed functions: Ptrace*, ptrace*, Reboot, Gettid, Splice, Tgkill, Unlinkat,
Unmount, Unshare
* libgo/go/syscall/libcall_posix_hurd.go: New file, derived from
libcall_posix.go. Remove mount, madvise.
* libgo/go/syscall/socket_hurd.go: New file, derived from socket_bsd.go.
* libgo/go/syscall/wait.c: Define WCONTINUED if not defined.
* libgo/go/syscall/syscall_hurd.go: New file, identical to syscall_linux.go.
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/errstr_linux.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/syscall/errstr_linux.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// errstr_linux.go -- GNU/Linux specific error strings.
-
-// Copyright 2010 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.
-
-// We use this rather than errstr.go because on GNU/Linux sterror_r
-// returns a pointer to the error message, and may not use buf at all.
-
-package syscall
-
-import "unsafe"
-
-//sysnb strerror_r(errnum int, b []byte) (errstr *byte)
-//strerror_r(errnum _C_int, b *byte, len Size_t) *byte
-
-func Errstr(errnum int) string {
- a := make([]byte, 128)
- p := strerror_r(errnum, a)
- b := (*[1000]byte)(unsafe.Pointer(p))
- i := 0
- for b[i] != 0 {
- i++
- }
- // Lowercase first letter: Bad -> bad, but STREAM -> STREAM.
- if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
- c := b[0] + 'a' - 'A'
- return string(c) + string(b[1:i])
- }
- return string(b[:i])
-}
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/errstr_glibc.go
===================================================================
--- /dev/null
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/errstr_glibc.go
@@ -0,0 +1,33 @@
+// errstr_glibc.go -- GNU/Linux and GNU/Hurd specific error strings.
+
+// Copyright 2010 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.
+
+// We use this rather than errstr.go because on GNU/Linux sterror_r
+// returns a pointer to the error message, and may not use buf at all.
+
+// +build hurd linux
+
+package syscall
+
+import "unsafe"
+
+//sysnb strerror_r(errnum int, b []byte) (errstr *byte)
+//strerror_r(errnum _C_int, b *byte, len Size_t) *byte
+
+func Errstr(errnum int) string {
+ a := make([]byte, 128)
+ p := strerror_r(errnum, a)
+ b := (*[1000]byte)(unsafe.Pointer(p))
+ i := 0
+ for b[i] != 0 {
+ i++
+ }
+ // Lowercase first letter: Bad -> bad, but STREAM -> STREAM.
+ if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+ c := b[0] + 'a' - 'A'
+ return string(c) + string(b[1:i])
+ }
+ return string(b[:i])
+}
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/libcall_hurd_386.go
===================================================================
--- /dev/null
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/libcall_hurd_386.go
@@ -0,0 +1,11 @@
+// Copyright 2012 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.
+
+// GNU/Hurd library calls 386 specific derived from libcall_linux_386.go.
+// Remove Iopl, iopl.
+
+package syscall
+
+//sys Ioperm(from int, num int, on int) (err error)
+//ioperm(from _C_long, num _C_long, on _C_int) _C_int
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/libcall_hurd.go
===================================================================
--- /dev/null
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/libcall_hurd.go
@@ -0,0 +1,175 @@
+// Copyright 2014 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.
+
+// GNU/Hurd library calls.
+// This file is derived from libcall_linux.go
+// Dummy function: raw_ptrace
+// Removed functions: {P,p}trace*, Reboot, Gettid, Splice, Tgkill, Unlinkat, Unmount, Unshare
+
+package syscall
+
+import "unsafe"
+
+//sys Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
+//__go_openat(dirfd _C_int, path *byte, flags _C_int, mode Mode_t) _C_int
+
+//sys futimesat(dirfd int, path *byte, times *[2]Timeval) (err error)
+//futimesat(dirfd _C_int, path *byte, times *[2]Timeval) _C_int
+func Futimesat(dirfd int, path string, tv []Timeval) (err error) {
+ if len(tv) != 2 {
+ return EINVAL
+ }
+ return futimesat(dirfd, StringBytePtr(path), (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+func Futimes(fd int, tv []Timeval) (err error) {
+ // Believe it or not, this is the best we can do on GNU/Linux
+ // (and is what glibc does).
+ return Utimes("/proc/self/fd/"+itoa(fd), tv)
+}
+
+//sys ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
+//ptrace(request _C_int, pid Pid_t, addr *byte, data *byte) _C_long
+
+// Dummy function
+func raw_ptrace(request int, pid int, addr *byte, data *byte) Errno {
+ return ENOSYS
+}
+
+//sys accept4(fd int, sa *RawSockaddrAny, len *Socklen_t, flags int) (nfd int, err error)
+//accept4(fd _C_int, sa *RawSockaddrAny, len *Socklen_t, flags _C_int) _C_int
+
+func Accept4(fd int, flags int) (nfd int, sa Sockaddr, err error) {
+ var rsa RawSockaddrAny
+ var len Socklen_t = SizeofSockaddrAny
+ nfd, err = accept4(fd, &rsa, &len, flags)
+ if err != nil {
+ return -1, nil, err
+ }
+ sa, err = anyToSockaddr(&rsa)
+ if err != nil {
+ Close(nfd)
+ return -1, nil, err
+ }
+ return nfd, sa, nil
+}
+
+///INCLUDE?
+///sys Acct(path string) (err error)
+///acct(path *byte) _C_int
+
+//sysnb Dup3(oldfd int, newfd int, flags int) (err error)
+//dup3(oldfd _C_int, newfd _C_int, flags _C_int) _C_int
+
+//sys Faccessat(dirfd int, path string, mode uint32, flags int) (err error)
+//faccessat(dirfd _C_int, pathname *byte, mode _C_int, flags _C_int) _C_int
+
+//sys Fallocate(fd int, mode uint32, off int64, len int64) (err error)
+//fallocate(fd _C_int, mode _C_int, offset Offset_t, len Offset_t) _C_int
+
+//sys Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
+//fchmodat(dirfd _C_int, pathname *byte, mode Mode_t, flags _C_int) _C_int
+
+//sys Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
+//fchownat(dirfd _C_int, path *byte, owner Uid_t, group Gid_t, flags _C_int) _C_int
+
+//sys Flock(fd int, how int) (err error)
+//flock(fd _C_int, how _C_int) _C_int
+
+//sys Fstatfs(fd int, buf *Statfs_t) (err error)
+//fstatfs(fd _C_int, buf *Statfs_t) _C_int
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+ var p *byte
+ if len(buf) > 0 {
+ p = &buf[0]
+ } else {
+ p = (*byte)(unsafe.Pointer(&_zero))
+ }
+ s := SYS_GETDENTS64
+ if s == 0 {
+ s = SYS_GETDENTS
+ }
+ r1, _, errno := Syscall(uintptr(s), uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(len(buf)))
+ n = int(r1)
+ if n < 0 {
+ err = errno
+ }
+ return
+}
+
+func ReadDirent(fd int, buf []byte) (n int, err error) {
+ return Getdents(fd, buf)
+}
+
+
+///INCLUDE??
+///sys Getxattr(path string, attr string, dest []byte) (sz int, err error)
+///getxattr(path *byte, attr *byte, buf *byte, count Size_t) Ssize_t
+
+///INCLUDE??
+///sys Listxattr(path string, dest []byte) (sz int, err error)
+///listxattr(path *byte, list *byte, size Size_t) Ssize_t
+
+//sys Mkdirat(dirfd int, path string, mode uint32) (err error)
+//mkdirat(dirfd _C_int, path *byte, mode Mode_t) _C_int
+
+//sys Mknodat(dirfd int, path string, mode uint32, dev int) (err error)
+//mknodat(dirfd _C_int, path *byte, mode Mode_t, dev _dev_t) _C_int
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+//pipe2(p *[2]_C_int, flags _C_int) _C_int
+func Pipe2(p []int, flags int) (err error) {
+ if len(p) != 2 {
+ return EINVAL
+ }
+ var pp [2]_C_int
+ err = pipe2(&pp, flags)
+ p[0] = int(pp[0])
+ p[1] = int(pp[1])
+ return
+}
+
+///INCLUDE??
+///sys Removexattr(path string, attr string) (err error)
+///removexattr(path *byte, name *byte) _C_int
+
+///INCLUDE??
+///sys Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
+///renameat(olddirfd _C_int, oldpath *byte, newdirfd _C_int, newpath *byte) _C_int
+
+//INCLUDE??
+///sys Setxattr(path string, attr string, data []byte, flags int) (err error)
+///setxattr(path *byte, name *byte, value *byte, size Size_t, flags _C_int) _C_int
+
+//sys SyncFileRange(fd int, off int64, n int64, flags int) (err error)
+//sync_file_range(fd _C_int, off Offset_t, n Offset_t, flags _C_uint) _C_int
+
+//INCLUDE??
+///sysnb Sysinfo(info *Sysinfo_t) (err error)
+///sysinfo(info *Sysinfo_t) _C_int
+
+//func Unlinkat(dirfd int, path string) (err error) {
+// return unlinkat(dirfd, path, 0)
+//}
+
+///INCLUDE??
+///sys Ustat(dev int, ubuf *Ustat_t) (err error)
+///ustat(dev _dev_t, ubuf *Ustat_t) _C_int
+
+//sys sendfile(outfd int, infd int, offset *Offset_t, count int) (written int, err error)
+//sendfile64(outfd _C_int, infd _C_int, offset *Offset_t, count Size_t) Ssize_t
+func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+ var soff Offset_t
+ var psoff *Offset_t
+ if offset != nil {
+ soff = Offset_t(*offset)
+ psoff = &soff
+ }
+ written, err = sendfile(outfd, infd, psoff, count)
+ if offset != nil {
+ *offset = int64(soff)
+ }
+ return
+}
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/libcall_posix_hurd.go
===================================================================
--- /dev/null
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/libcall_posix_hurd.go
@@ -0,0 +1,400 @@
+// Copyright 2011 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.
+
+// POSIX library calls.
+// This file is compiled as ordinary Go code,
+// but it is also input to mksyscall,
+// which parses the //sys lines and generates library call stubs.
+// Note that sometimes we use a lowercase //sys name and
+// wrap it in our own nicer implementation.
+// Removed the mount call for GNU/Hurd, it exists but use translators.
+// Functionality is not the same as descibed in Linux <sys/mount.h>
+// Removed the madvise call for GNU/Hurd, not yet implemented.
+// This file is derived from libcall_posix.go
+
+// +build hurd
+
+package syscall
+
+import "unsafe"
+
+/*
+ * Wrapped
+ */
+
+//sysnb pipe(p *[2]_C_int) (err error)
+//pipe(p *[2]_C_int) _C_int
+func Pipe(p []int) (err error) {
+ if len(p) != 2 {
+ return EINVAL
+ }
+ var pp [2]_C_int
+ err = pipe(&pp)
+ p[0] = int(pp[0])
+ p[1] = int(pp[1])
+ return
+}
+
+//sys utimes(path string, times *[2]Timeval) (err error)
+//utimes(path *byte, times *[2]Timeval) _C_int
+func Utimes(path string, tv []Timeval) (err error) {
+ if len(tv) != 2 {
+ return EINVAL
+ }
+ return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+//sys getcwd(buf *byte, size Size_t) (err error)
+//getcwd(buf *byte, size Size_t) *byte
+
+const ImplementsGetwd = true
+
+func Getwd() (ret string, err error) {
+ for len := Size_t(4096); ; len *= 2 {
+ b := make([]byte, len)
+ err := getcwd(&b[0], len)
+ if err == nil {
+ i := 0
+ for b[i] != 0 {
+ i++
+ }
+ return string(b[0:i]), nil
+ }
+ if err != ERANGE {
+ return "", err
+ }
+ }
+}
+
+func Getcwd(buf []byte) (n int, err error) {
+ err = getcwd(&buf[0], Size_t(len(buf)))
+ if err == nil {
+ i := 0
+ for buf[i] != 0 {
+ i++
+ }
+ n = i + 1
+ }
+ return
+}
+
+//sysnb getgroups(size int, list *Gid_t) (nn int, err error)
+//getgroups(size _C_int, list *Gid_t) _C_int
+
+func Getgroups() (gids []int, err error) {
+ n, err := getgroups(0, nil)
+ if err != nil {
+ return nil, err
+ }
+ if n == 0 {
+ return nil, nil
+ }
+
+ // Sanity check group count. Max is 1<<16 on GNU/Linux.
+ if n < 0 || n > 1<<20 {
+ return nil, EINVAL
+ }
+
+ a := make([]Gid_t, n)
+ n, err = getgroups(n, &a[0])
+ if err != nil {
+ return nil, err
+ }
+ gids = make([]int, n)
+ for i, v := range a[0:n] {
+ gids[i] = int(v)
+ }
+ return
+}
+
+//sysnb setgroups(n int, list *Gid_t) (err error)
+//setgroups(n Size_t, list *Gid_t) _C_int
+
+func Setgroups(gids []int) (err error) {
+ if len(gids) == 0 {
+ return setgroups(0, nil)
+ }
+
+ a := make([]Gid_t, len(gids))
+ for i, v := range gids {
+ a[i] = Gid_t(v)
+ }
+ return setgroups(len(a), &a[0])
+}
+
+type WaitStatus uint32
+
+// The WaitStatus methods are implemented in C, to pick up the macros
+// #defines in <sys/wait.h>.
+
+func (w WaitStatus) Exited() bool
+func (w WaitStatus) Signaled() bool
+func (w WaitStatus) Stopped() bool
+func (w WaitStatus) Continued() bool
+func (w WaitStatus) CoreDump() bool
+func (w WaitStatus) ExitStatus() int
+func (w WaitStatus) Signal() Signal
+func (w WaitStatus) StopSignal() Signal
+func (w WaitStatus) TrapCause() int
+
+//sys Mkfifo(path string, mode uint32) (err error)
+//mkfifo(path *byte, mode Mode_t) _C_int
+
+//sys Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
+//select(nfd _C_int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) _C_int
+
+const nfdbits = int(unsafe.Sizeof(fds_bits_type(0)) * 8)
+
+type FdSet struct {
+ Bits [(FD_SETSIZE + nfdbits - 1) / nfdbits]fds_bits_type
+}
+
+func FDSet(fd int, set *FdSet) {
+ set.Bits[fd/nfdbits] |= (1 << (uint)(fd%nfdbits))
+}
+
+func FDClr(fd int, set *FdSet) {
+ set.Bits[fd/nfdbits] &^= (1 << (uint)(fd%nfdbits))
+}
+
+func FDIsSet(fd int, set *FdSet) bool {
+ if set.Bits[fd/nfdbits]&(1<<(uint)(fd%nfdbits)) != 0 {
+ return true
+ } else {
+ return false
+ }
+}
+
+func FDZero(set *FdSet) {
+ for i := range set.Bits {
+ set.Bits[i] = 0
+ }
+}
+
+//sys Access(path string, mode uint32) (err error)
+//access(path *byte, mode _C_int) _C_int
+
+//sys Chdir(path string) (err error)
+//chdir(path *byte) _C_int
+
+//sys Chmod(path string, mode uint32) (err error)
+//chmod(path *byte, mode Mode_t) _C_int
+
+//sys Chown(path string, uid int, gid int) (err error)
+//chown(path *byte, uid Uid_t, gid Gid_t) _C_int
+
+//sys Chroot(path string) (err error)
+//chroot(path *byte) _C_int
+
+//sys Close(fd int) (err error)
+//close(fd _C_int) _C_int
+
+//sys Creat(path string, mode uint32) (fd int, err error)
+//creat(path *byte, mode Mode_t) _C_int
+
+//sysnb Dup(oldfd int) (fd int, err error)
+//dup(oldfd _C_int) _C_int
+
+//sysnb Dup2(oldfd int, newfd int) (err error)
+//dup2(oldfd _C_int, newfd _C_int) _C_int
+
+//sys Fchdir(fd int) (err error)
+//fchdir(fd _C_int) _C_int
+
+//sys Fchmod(fd int, mode uint32) (err error)
+//fchmod(fd _C_int, mode Mode_t) _C_int
+
+//sys Fchown(fd int, uid int, gid int) (err error)
+//fchown(fd _C_int, uid Uid_t, gid Gid_t) _C_int
+
+//sys fcntl(fd int, cmd int, arg int) (val int, err error)
+//__go_fcntl(fd _C_int, cmd _C_int, arg _C_int) _C_int
+
+//sys FcntlFlock(fd uintptr, cmd int, lk *Flock_t) (err error)
+//__go_fcntl_flock(fd _C_int, cmd _C_int, arg *Flock_t) _C_int
+
+//sys Fdatasync(fd int) (err error)
+//fdatasync(fd _C_int) _C_int
+
+//sys Fsync(fd int) (err error)
+//fsync(fd _C_int) _C_int
+
+//sysnb Getegid() (egid int)
+//getegid() Gid_t
+
+//sysnb Geteuid() (euid int)
+//geteuid() Uid_t
+
+//sysnb Getgid() (gid int)
+//getgid() Gid_t
+
+//sysnb Getpgid(pid int) (pgid int, err error)
+//getpgid(pid Pid_t) Pid_t
+
+//sysnb Getpgrp() (pid int)
+//getpgrp() Pid_t
+
+//sysnb Getpid() (pid int)
+//getpid() Pid_t
+
+//sysnb Getppid() (ppid int)
+//getppid() Pid_t
+
+//sys Getpriority(which int, who int) (prio int, err error)
+//getpriority(which _C_int, who _C_int) _C_int
+
+//sysnb Getrusage(who int, rusage *Rusage) (err error)
+//getrusage(who _C_int, rusage *Rusage) _C_int
+
+//sysnb gettimeofday(tv *Timeval, tz *byte) (err error)
+//gettimeofday(tv *Timeval, tz *byte) _C_int
+func Gettimeofday(tv *Timeval) (err error) {
+ return gettimeofday(tv, nil)
+}
+
+//sysnb Getuid() (uid int)
+//getuid() Uid_t
+
+//sysnb Kill(pid int, sig Signal) (err error)
+//kill(pid Pid_t, sig _C_int) _C_int
+
+//sys Lchown(path string, uid int, gid int) (err error)
+//lchown(path *byte, uid Uid_t, gid Gid_t) _C_int
+
+//sys Link(oldpath string, newpath string) (err error)
+//link(oldpath *byte, newpath *byte) _C_int
+
+//sys Mkdir(path string, mode uint32) (err error)
+//mkdir(path *byte, mode Mode_t) _C_int
+
+//sys Mknod(path string, mode uint32, dev int) (err error)
+//mknod(path *byte, mode Mode_t, dev _dev_t) _C_int
+
+//sys Nanosleep(time *Timespec, leftover *Timespec) (err error)
+//nanosleep(time *Timespec, leftover *Timespec) _C_int
+
+//sys Pause() (err error)
+//pause() _C_int
+
+//sys read(fd int, p []byte) (n int, err error)
+//read(fd _C_int, buf *byte, count Size_t) Ssize_t
+
+//sys readlen(fd int, p *byte, np int) (n int, err error)
+//read(fd _C_int, buf *byte, count Size_t) Ssize_t
+
+//sys Readlink(path string, buf []byte) (n int, err error)
+//readlink(path *byte, buf *byte, bufsiz Size_t) Ssize_t
+
+//sys Rename(oldpath string, newpath string) (err error)
+//rename(oldpath *byte, newpath *byte) _C_int
+
+//sys Rmdir(path string) (err error)
+//rmdir(path *byte) _C_int
+
+//sys Setdomainname(p []byte) (err error)
+//setdomainname(name *byte, len Size_t) _C_int
+
+//sys Sethostname(p []byte) (err error)
+//sethostname(name *byte, len Size_t) _C_int
+
+//sysnb Setgid(gid int) (err error)
+//setgid(gid Gid_t) _C_int
+
+//sysnb Setregid(rgid int, egid int) (err error)
+//setregid(rgid Gid_t, egid Gid_t) _C_int
+
+//sysnb Setpgid(pid int, pgid int) (err error)
+//setpgid(pid Pid_t, pgid Pid_t) _C_int
+
+//sys Setpriority(which int, who int, prio int) (err error)
+//setpriority(which _C_int, who _C_int, prio _C_int) _C_int
+
+//sysnb Setreuid(ruid int, euid int) (err error)
+//setreuid(ruid Uid_t, euid Uid_t) _C_int
+
+//sysnb Setsid() (pid int, err error)
+//setsid() Pid_t
+
+//sysnb settimeofday(tv *Timeval, tz *byte) (err error)
+//settimeofday(tv *Timeval, tz *byte) _C_int
+
+func Settimeofday(tv *Timeval) (err error) {
+ return settimeofday(tv, nil)
+}
+
+//sysnb Setuid(uid int) (err error)
+//setuid(uid Uid_t) _C_int
+
+//sys Symlink(oldpath string, newpath string) (err error)
+//symlink(oldpath *byte, newpath *byte) _C_int
+
+//sys Sync()
+//sync()
+
+//sysnb Time(t *Time_t) (tt Time_t, err error)
+//time(t *Time_t) Time_t
+
+//sysnb Times(tms *Tms) (ticks uintptr, err error)
+//times(tms *Tms) _clock_t
+
+//sysnb Umask(mask int) (oldmask int)
+//umask(mask Mode_t) Mode_t
+
+//sys Unlink(path string) (err error)
+//unlink(path *byte) _C_int
+
+//sys Utime(path string, buf *Utimbuf) (err error)
+//utime(path *byte, buf *Utimbuf) _C_int
+
+//sys write(fd int, p []byte) (n int, err error)
+//write(fd _C_int, buf *byte, count Size_t) Ssize_t
+
+//sys writelen(fd int, p *byte, np int) (n int, err error)
+//write(fd _C_int, buf *byte, count Size_t) Ssize_t
+
+//sys munmap(addr uintptr, length uintptr) (err error)
+//munmap(addr *byte, length Size_t) _C_int
+
+//sys Mprotect(b []byte, prot int) (err error)
+//mprotect(addr *byte, len Size_t, prot _C_int) _C_int
+
+//sys Mlock(b []byte) (err error)
+//mlock(addr *byte, len Size_t) _C_int
+
+//sys Munlock(b []byte) (err error)
+//munlock(addr *byte, len Size_t) _C_int
+
+//sys Mlockall(flags int) (err error)
+//mlockall(flags _C_int) _C_int
+
+//sys Munlockall() (err error)
+//munlockall() _C_int
+
+func setTimespec(sec, nsec int64) Timespec {
+ return Timespec{Sec: Timespec_sec_t(sec), Nsec: Timespec_nsec_t(nsec)}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+ return Timeval{Sec: Timeval_sec_t(sec), Usec: Timeval_usec_t(usec)}
+}
+
+//sysnb Tcgetattr(fd int, p *Termios) (err error)
+//tcgetattr(fd _C_int, p *Termios) _C_int
+
+//sys Tcsetattr(fd int, actions int, p *Termios) (err error)
+//tcsetattr(fd _C_int, actions _C_int, p *Termios) _C_int
+
+//sys sysconf(name int) (ret int64, err error)
+//sysconf(name _C_int) _C_long
+
+func Sysconf(name int) (ret int64, err error) {
+ // If an option is not available, sysconf returns -1 without
+ // changing errno. Detect this case and return err == nil.
+ SetErrno(0)
+ ret, err = sysconf(name)
+ if err == Errno(0) {
+ err = nil
+ }
+ return ret, err
+}
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/wait.c
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/syscall/wait.c
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/wait.c
@@ -8,6 +8,9 @@
OS-independent. */
#include <stdint.h>
+#ifndef WCONTINUED
+#define WCONTINUED 0
+#endif
#include <sys/wait.h>
#include "runtime.h"
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/exec_hurd.go
===================================================================
--- /dev/null
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/exec_hurd.go
@@ -0,0 +1,329 @@
+// Copyright 2009 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.
+
+// Fork, exec, wait, etc.
+
+// Derived from exec_unix.go by removing the SYS_EXECVE parts not defined on GNU/Hurd.
+
+package syscall
+
+import (
+ "runtime"
+ "sync"
+ "unsafe"
+)
+
+//sysnb raw_fork() (pid Pid_t, err Errno)
+//fork() Pid_t
+
+//sysnb raw_getpid() (pid Pid_t)
+//getpid() Pid_t
+
+//sysnb raw_getppid() (pid Pid_t)
+//getppid() Pid_t
+
+//sysnb raw_setsid() (err Errno)
+//setsid() Pid_t
+
+//sysnb raw_setpgid(pid int, pgid int) (err Errno)
+//setpgid(pid Pid_t, pgid Pid_t) _C_int
+
+//sysnb raw_chroot(path *byte) (err Errno)
+//chroot(path *byte) _C_int
+
+//sysnb raw_chdir(path *byte) (err Errno)
+//chdir(path *byte) _C_int
+
+//sysnb raw_fcntl(fd int, cmd int, arg int) (val int, err Errno)
+//__go_fcntl(fd _C_int, cmd _C_int, arg _C_int) _C_int
+
+//sysnb raw_close(fd int) (err Errno)
+//close(fd _C_int) _C_int
+
+//sysnb raw_ioctl(fd int, cmd uintptr, val int) (rval int, err Errno)
+//__go_ioctl(fd _C_int, cmd _C_int, val _C_int) _C_int
+
+//sysnb raw_ioctl_ptr(fd int, cmd uintptr, val unsafe.Pointer) (rval int, err Errno)
+//__go_ioctl_ptr(fd _C_int, cmd _C_int, val unsafe.Pointer) _C_int
+
+//sysnb raw_execve(argv0 *byte, argv **byte, envv **byte) (err Errno)
+//execve(argv0 *byte, argv **byte, envv **byte) _C_int
+
+//sysnb raw_write(fd int, buf *byte, count int) (err Errno)
+//write(fd _C_int, buf *byte, count Size_t) Ssize_t
+
+//sysnb raw_exit(status int)
+//_exit(status _C_int)
+
+//sysnb raw_dup2(oldfd int, newfd int) (err Errno)
+//dup2(oldfd _C_int, newfd _C_int) _C_int
+
+//sysnb raw_kill(pid Pid_t, sig Signal) (err Errno)
+//kill(pid Pid_t, sig _C_int) _C_int
+
+//sysnb raw_setgroups(size int, list unsafe.Pointer) (err Errno)
+//setgroups(size Size_t, list *Gid_t) _C_int
+
+// Lock synchronizing creation of new file descriptors with fork.
+//
+// We want the child in a fork/exec sequence to inherit only the
+// file descriptors we intend. To do that, we mark all file
+// descriptors close-on-exec and then, in the child, explicitly
+// unmark the ones we want the exec'ed program to keep.
+// Unix doesn't make this easy: there is, in general, no way to
+// allocate a new file descriptor close-on-exec. Instead you
+// have to allocate the descriptor and then mark it close-on-exec.
+// If a fork happens between those two events, the child's exec
+// will inherit an unwanted file descriptor.
+//
+// This lock solves that race: the create new fd/mark close-on-exec
+// operation is done holding ForkLock for reading, and the fork itself
+// is done holding ForkLock for writing. At least, that's the idea.
+// There are some complications.
+//
+// Some system calls that create new file descriptors can block
+// for arbitrarily long times: open on a hung NFS server or named
+// pipe, accept on a socket, and so on. We can't reasonably grab
+// the lock across those operations.
+//
+// It is worse to inherit some file descriptors than others.
+// If a non-malicious child accidentally inherits an open ordinary file,
+// that's not a big deal. On the other hand, if a long-lived child
+// accidentally inherits the write end of a pipe, then the reader
+// of that pipe will not see EOF until that child exits, potentially
+// causing the parent program to hang. This is a common problem
+// in threaded C programs that use popen.
+//
+// Luckily, the file descriptors that are most important not to
+// inherit are not the ones that can take an arbitrarily long time
+// to create: pipe returns instantly, and the net package uses
+// non-blocking I/O to accept on a listening socket.
+// The rules for which file descriptor-creating operations use the
+// ForkLock are as follows:
+//
+// 1) Pipe. Does not block. Use the ForkLock.
+// 2) Socket. Does not block. Use the ForkLock.
+// 3) Accept. If using non-blocking mode, use the ForkLock.
+// Otherwise, live with the race.
+// 4) Open. Can block. Use O_CLOEXEC if available (GNU/Linux).
+// Otherwise, live with the race.
+// 5) Dup. Does not block. Use the ForkLock.
+// On GNU/Linux, could use fcntl F_DUPFD_CLOEXEC
+// instead of the ForkLock, but only for dup(fd, -1).
+
+var ForkLock sync.RWMutex
+
+// StringSlicePtr converts a slice of strings to a slice of pointers
+// to NUL-terminated byte arrays. If any string contains a NUL byte
+// this function panics instead of returning an error.
+//
+// Deprecated: Use SlicePtrFromStrings instead.
+func StringSlicePtr(ss []string) []*byte {
+ bb := make([]*byte, len(ss)+1)
+ for i := 0; i < len(ss); i++ {
+ bb[i] = StringBytePtr(ss[i])
+ }
+ bb[len(ss)] = nil
+ return bb
+}
+
+// SlicePtrFromStrings converts a slice of strings to a slice of
+// pointers to NUL-terminated byte arrays. If any string contains
+// a NUL byte, it returns (nil, EINVAL).
+func SlicePtrFromStrings(ss []string) ([]*byte, error) {
+ var err error
+ bb := make([]*byte, len(ss)+1)
+ for i := 0; i < len(ss); i++ {
+ bb[i], err = BytePtrFromString(ss[i])
+ if err != nil {
+ return nil, err
+ }
+ }
+ bb[len(ss)] = nil
+ return bb, nil
+}
+
+func CloseOnExec(fd int) { fcntl(fd, F_SETFD, FD_CLOEXEC) }
+
+func SetNonblock(fd int, nonblocking bool) (err error) {
+ flag, err := fcntl(fd, F_GETFL, 0)
+ if err != nil {
+ return err
+ }
+ if nonblocking {
+ flag |= O_NONBLOCK
+ } else {
+ flag &^= O_NONBLOCK
+ }
+ _, err = fcntl(fd, F_SETFL, flag)
+ return err
+}
+
+// Credential holds user and group identities to be assumed
+// by a child process started by StartProcess.
+type Credential struct {
+ Uid uint32 // User ID.
+ Gid uint32 // Group ID.
+ Groups []uint32 // Supplementary group IDs.
+ NoSetGroups bool // If true, don't set supplementary groups
+}
+
+// ProcAttr holds attributes that will be applied to a new process started
+// by StartProcess.
+type ProcAttr struct {
+ Dir string // Current working directory.
+ Env []string // Environment.
+ Files []uintptr // File descriptors.
+ Sys *SysProcAttr
+}
+
+var zeroProcAttr ProcAttr
+var zeroSysProcAttr SysProcAttr
+
+func forkExec(argv0 string, argv []string, attr *ProcAttr) (pid int, err error) {
+ var p [2]int
+ var n int
+ var err1 Errno
+ var wstatus WaitStatus
+
+ if attr == nil {
+ attr = &zeroProcAttr
+ }
+ sys := attr.Sys
+ if sys == nil {
+ sys = &zeroSysProcAttr
+ }
+
+ p[0] = -1
+ p[1] = -1
+
+ // Convert args to C form.
+ argv0p, err := BytePtrFromString(argv0)
+ if err != nil {
+ return 0, err
+ }
+ argvp, err := SlicePtrFromStrings(argv)
+ if err != nil {
+ return 0, err
+ }
+ envvp, err := SlicePtrFromStrings(attr.Env)
+ if err != nil {
+ return 0, err
+ }
+
+ if (runtime.GOOS == "freebsd" || runtime.GOOS == "dragonfly") && len(argv[0]) > len(argv0) {
+ argvp[0] = argv0p
+ }
+
+ var chroot *byte
+ if sys.Chroot != "" {
+ chroot, err = BytePtrFromString(sys.Chroot)
+ if err != nil {
+ return 0, err
+ }
+ }
+ var dir *byte
+ if attr.Dir != "" {
+ dir, err = BytePtrFromString(attr.Dir)
+ if err != nil {
+ return 0, err
+ }
+ }
+
+ // Acquire the fork lock so that no other threads
+ // create new fds that are not yet close-on-exec
+ // before we fork.
+ ForkLock.Lock()
+
+ // Allocate child status pipe close on exec.
+ if err = forkExecPipe(p[:]); err != nil {
+ goto error
+ }
+
+ // Kick off child.
+ pid, err1 = forkAndExecInChild(argv0p, argvp, envvp, chroot, dir, attr, sys, p[1])
+ if err1 != 0 {
+ err = Errno(err1)
+ goto error
+ }
+ ForkLock.Unlock()
+
+ // Read child error status from pipe.
+ Close(p[1])
+ n, err = readlen(p[0], (*byte)(unsafe.Pointer(&err1)), int(unsafe.Sizeof(err1)))
+ Close(p[0])
+ if err != nil || n != 0 {
+ if n == int(unsafe.Sizeof(err1)) {
+ err = Errno(err1)
+ }
+ if err == nil {
+ err = EPIPE
+ }
+
+ // Child failed; wait for it to exit, to make sure
+ // the zombies don't accumulate.
+ _, err1 := Wait4(pid, &wstatus, 0, nil)
+ for err1 == EINTR {
+ _, err1 = Wait4(pid, &wstatus, 0, nil)
+ }
+ return 0, err
+ }
+
+ // Read got EOF, so pipe closed on exec, so exec succeeded.
+ return pid, nil
+
+error:
+ if p[0] >= 0 {
+ Close(p[0])
+ Close(p[1])
+ }
+ ForkLock.Unlock()
+ return 0, err
+}
+
+// Combination of fork and exec, careful to be thread safe.
+func ForkExec(argv0 string, argv []string, attr *ProcAttr) (pid int, err error) {
+ return forkExec(argv0, argv, attr)
+}
+
+// StartProcess wraps ForkExec for package os.
+func StartProcess(argv0 string, argv []string, attr *ProcAttr) (pid int, handle uintptr, err error) {
+ pid, err = forkExec(argv0, argv, attr)
+ return pid, 0, err
+}
+
+// Implemented in runtime package.
+func runtime_BeforeExec()
+func runtime_AfterExec()
+
+// execveLibc is non-nil on OS using libc syscall, set to execve in exec_libc.go; this
+// avoids a build dependency for other platforms.
+var execveLibc func(path uintptr, argv uintptr, envp uintptr) Errno
+var execveDarwin func(path *byte, argv **byte, envp **byte) error
+
+// Exec invokes the execve(2) system call.
+func Exec(argv0 string, argv []string, envv []string) (err error) {
+ argv0p, err := BytePtrFromString(argv0)
+ if err != nil {
+ return err
+ }
+ argvp, err := SlicePtrFromStrings(argv)
+ if err != nil {
+ return err
+ }
+ envvp, err := SlicePtrFromStrings(envv)
+ if err != nil {
+ return err
+ }
+ runtime_BeforeExec()
+
+ var err1 error
+ // RawSyscall should never be used on Solaris or AIX.
+ err1 = execveLibc(
+ uintptr(unsafe.Pointer(argv0p)),
+ uintptr(unsafe.Pointer(&argvp[0])),
+ uintptr(unsafe.Pointer(&envvp[0])))
+ runtime_AfterExec()
+ return err1
+}
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/syscall_linux.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/syscall/syscall_linux.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2009 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.
-
-package syscall
-
-import "unsafe"
-
-func rawSyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr) {
- r1, r2, _ = RawSyscall(trap, a1, a2, a3)
- return
-}
-
-func direntIno(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Ino), unsafe.Sizeof(Dirent{}.Ino))
-}
-
-func direntReclen(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Reclen), unsafe.Sizeof(Dirent{}.Reclen))
-}
-
-func direntNamlen(buf []byte) (uint64, bool) {
- reclen, ok := direntReclen(buf)
- if !ok {
- return 0, false
- }
- return reclen - uint64(unsafe.Offsetof(Dirent{}.Name)), true
-}
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/syscall_glibc.go
===================================================================
--- /dev/null
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/syscall_glibc.go
@@ -0,0 +1,30 @@
+// Copyright 2009 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.
+
+// +build hurd linux
+
+package syscall
+
+import "unsafe"
+
+func rawSyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr) {
+ r1, r2, _ = RawSyscall(trap, a1, a2, a3)
+ return
+}
+
+func direntIno(buf []byte) (uint64, bool) {
+ return readInt(buf, unsafe.Offsetof(Dirent{}.Ino), unsafe.Sizeof(Dirent{}.Ino))
+}
+
+func direntReclen(buf []byte) (uint64, bool) {
+ return readInt(buf, unsafe.Offsetof(Dirent{}.Reclen), unsafe.Sizeof(Dirent{}.Reclen))
+}
+
+func direntNamlen(buf []byte) (uint64, bool) {
+ reclen, ok := direntReclen(buf)
+ if !ok {
+ return 0, false
+ }
+ return reclen - uint64(unsafe.Offsetof(Dirent{}.Name)), true
+}
[-- Attachment #12: src_libgo_go_test.diff --]
[-- Type: text/x-patch, Size: 11378 bytes --]
libgo/ChangeLog
2019-01-28 Svante Signell <svante.signell@gmail.com>
* libgo/go/os/os_test.go:(TestSeek): Skip seek tests larger than 1<<32
2018-10-20 Svante Signell <svante.signell@gmail.com>
* libgo/go/syscall/syscall_hurd_test.go: New file, derived from
syscall_unix_test.go. Flock_t members Type and Whence are int32
instead of int16.
Index: gcc-9-9-20190125-2.1/src/libgo/go/syscall/syscall_hurd_test.go
===================================================================
--- /dev/null
+++ gcc-9-9-20190125-2.1/src/libgo/go/syscall/syscall_hurd_test.go
@@ -0,0 +1,354 @@
+// Copyright 2013 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.
+// This file is identical to syscall_unix_test.go except that
+// Flock_t members Type and Whence are int32 instead of int16.
+
+// +build hurd
+
+package syscall_test
+
+import (
+ "flag"
+ "fmt"
+ "internal/testenv"
+ "io"
+ "io/ioutil"
+ "net"
+ "os"
+ "os/exec"
+ "path/filepath"
+ "runtime"
+ "syscall"
+ "testing"
+ "time"
+)
+
+// Tests that below functions, structures and constants are consistent
+// on all Unix-like systems.
+func _() {
+ // program scheduling priority functions and constants
+ var (
+ _ func(int, int, int) error = syscall.Setpriority
+ _ func(int, int) (int, error) = syscall.Getpriority
+ )
+ const (
+ _ int = syscall.PRIO_USER
+ _ int = syscall.PRIO_PROCESS
+ _ int = syscall.PRIO_PGRP
+ )
+
+ // termios constants
+ const (
+ _ int = syscall.TCIFLUSH
+ _ int = syscall.TCIOFLUSH
+ _ int = syscall.TCOFLUSH
+ )
+
+ // fcntl file locking structure and constants
+ var (
+ _ = syscall.Flock_t{
+ Type: int32(0),
+ Whence: int32(0),
+ Start: int64(0),
+ Len: int64(0),
+ Pid: int32(0),
+ }
+ )
+ const (
+ _ = syscall.F_GETLK
+ _ = syscall.F_SETLK
+ _ = syscall.F_SETLKW
+ )
+}
+
+// TestFcntlFlock tests whether the file locking structure matches
+// the calling convention of each kernel.
+// On some Linux systems, glibc uses another set of values for the
+// commands and translates them to the correct value that the kernel
+// expects just before the actual fcntl syscall. As Go uses raw
+// syscalls directly, it must use the real value, not the glibc value.
+// Thus this test also verifies that the Flock_t structure can be
+// roundtripped with F_SETLK and F_GETLK.
+func TestFcntlFlock(t *testing.T) {
+ flock := syscall.Flock_t{
+ Type: syscall.F_WRLCK,
+ Start: 31415, Len: 271828, Whence: 1,
+ }
+ if os.Getenv("GO_WANT_HELPER_PROCESS") == "" {
+ // parent
+ tempDir, err := ioutil.TempDir("", "TestFcntlFlock")
+ if err != nil {
+ t.Fatalf("Failed to create temp dir: %v", err)
+ }
+ name := filepath.Join(tempDir, "TestFcntlFlock")
+ fd, err := syscall.Open(name, syscall.O_CREAT|syscall.O_RDWR|syscall.O_CLOEXEC, 0)
+ if err != nil {
+ t.Fatalf("Open failed: %v", err)
+ }
+ defer os.RemoveAll(tempDir)
+ defer syscall.Close(fd)
+ if err := syscall.Ftruncate(fd, 1<<20); err != nil {
+ t.Fatalf("Ftruncate(1<<20) failed: %v", err)
+ }
+ if err := syscall.FcntlFlock(uintptr(fd), syscall.F_SETLK, &flock); err != nil {
+ t.Fatalf("FcntlFlock(F_SETLK) failed: %v", err)
+ }
+ cmd := exec.Command(os.Args[0], "-test.run=^TestFcntlFlock$")
+ cmd.Env = append(os.Environ(), "GO_WANT_HELPER_PROCESS=1")
+ cmd.ExtraFiles = []*os.File{os.NewFile(uintptr(fd), name)}
+ out, err := cmd.CombinedOutput()
+ if len(out) > 0 || err != nil {
+// t.Fatalf("child process: %q, %v", out, err)
+ fmt.Printf("child process: %q, %v", out, err)
+ t.Logf("child process: %q, %v", out, err)
+ }
+ } else {
+ // child
+ got := flock
+ // make sure the child lock is conflicting with the parent lock
+ got.Start--
+ got.Len++
+ if err := syscall.FcntlFlock(3, syscall.F_GETLK, &got); err != nil {
+ t.Fatalf("FcntlFlock(F_GETLK) failed: %v", err)
+ }
+ flock.Pid = int32(syscall.Getppid())
+ // Hurd does not set Whence or Pid
+ // FIXME
+ if got.Type == flock.Type && got.Start == flock.Start && got.Len == flock.Len && got.Pid == flock.Pid && got.Whence == flock.Whence {
+ os.Exit(0)
+ }
+ t.Skipf("FcntlFlock got %v, want %v", got, flock)
+ t.Logf("FcntlFlock got %v, want %v", got, flock)
+// t.Fatalf("FcntlFlock got %v, want %v", got, flock)
+ }
+}
+
+// TestPassFD tests passing a file descriptor over a Unix socket.
+//
+// This test involved both a parent and child process. The parent
+// process is invoked as a normal test, with "go test", which then
+// runs the child process by running the current test binary with args
+// "-test.run=^TestPassFD$" and an environment variable used to signal
+// that the test should become the child process instead.
+func TestPassFD(t *testing.T) {
+ testenv.MustHaveExec(t)
+
+ if os.Getenv("GO_WANT_HELPER_PROCESS") == "1" {
+ passFDChild()
+ return
+ }
+
+ tempDir, err := ioutil.TempDir("", "TestPassFD")
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer os.RemoveAll(tempDir)
+
+ fds, err := syscall.Socketpair(syscall.AF_LOCAL, syscall.SOCK_STREAM, 0)
+ if err != nil {
+ t.Fatalf("Socketpair: %v", err)
+ }
+ defer syscall.Close(fds[0])
+ defer syscall.Close(fds[1])
+ writeFile := os.NewFile(uintptr(fds[0]), "child-writes")
+ readFile := os.NewFile(uintptr(fds[1]), "parent-reads")
+ defer writeFile.Close()
+ defer readFile.Close()
+
+ cmd := exec.Command(os.Args[0], "-test.run=^TestPassFD$", "--", tempDir)
+ cmd.Env = append(os.Environ(), "GO_WANT_HELPER_PROCESS=1")
+ cmd.ExtraFiles = []*os.File{writeFile}
+
+ out, err := cmd.CombinedOutput()
+ if len(out) > 0 || err != nil {
+ t.Fatalf("child process: %q, %v", out, err)
+ }
+
+ c, err := net.FileConn(readFile)
+ if err != nil {
+ t.Fatalf("FileConn: %v", err)
+ }
+ defer c.Close()
+
+ uc, ok := c.(*net.UnixConn)
+ if !ok {
+ t.Fatalf("unexpected FileConn type; expected UnixConn, got %T", c)
+ }
+
+ buf := make([]byte, 32) // expect 1 byte
+ oob := make([]byte, 32) // expect 24 bytes
+ closeUnix := time.AfterFunc(5*time.Second, func() {
+ t.Logf("timeout reading from unix socket")
+ uc.Close()
+ })
+ _, oobn, _, _, err := uc.ReadMsgUnix(buf, oob)
+ if err != nil {
+ t.Fatalf("ReadMsgUnix: %v", err)
+ }
+ closeUnix.Stop()
+
+ scms, err := syscall.ParseSocketControlMessage(oob[:oobn])
+ if err != nil {
+ t.Fatalf("ParseSocketControlMessage: %v", err)
+ }
+ if len(scms) != 1 {
+ t.Fatalf("expected 1 SocketControlMessage; got scms = %#v", scms)
+ }
+ scm := scms[0]
+ gotFds, err := syscall.ParseUnixRights(&scm)
+ if err != nil {
+ t.Fatalf("syscall.ParseUnixRights: %v", err)
+ }
+ if len(gotFds) != 1 {
+ t.Fatalf("wanted 1 fd; got %#v", gotFds)
+ }
+
+ f := os.NewFile(uintptr(gotFds[0]), "fd-from-child")
+ defer f.Close()
+
+ got, err := ioutil.ReadAll(f)
+ want := "Hello from child process!\n"
+ if string(got) != want {
+ t.Errorf("child process ReadAll: %q, %v; want %q", got, err, want)
+ }
+}
+
+// passFDChild is the child process used by TestPassFD.
+func passFDChild() {
+ defer os.Exit(0)
+
+ // Look for our fd. It should be fd 3, but we work around an fd leak
+ // bug here (https://golang.org/issue/2603) to let it be elsewhere.
+ var uc *net.UnixConn
+ for fd := uintptr(3); fd <= 10; fd++ {
+ f := os.NewFile(fd, "unix-conn")
+ var ok bool
+ netc, _ := net.FileConn(f)
+ uc, ok = netc.(*net.UnixConn)
+ if ok {
+ break
+ }
+ }
+ if uc == nil {
+ fmt.Println("failed to find unix fd")
+ return
+ }
+
+ // Make a file f to send to our parent process on uc.
+ // We make it in tempDir, which our parent will clean up.
+ flag.Parse()
+ tempDir := flag.Arg(0)
+ f, err := ioutil.TempFile(tempDir, "")
+ if err != nil {
+ fmt.Printf("TempFile: %v", err)
+ return
+ }
+
+ f.Write([]byte("Hello from child process!\n"))
+ f.Seek(0, io.SeekStart)
+
+ rights := syscall.UnixRights(int(f.Fd()))
+ dummyByte := []byte("x")
+ n, oobn, err := uc.WriteMsgUnix(dummyByte, rights, nil)
+ if err != nil {
+ fmt.Printf("WriteMsgUnix: %v", err)
+ return
+ }
+ if n != 1 || oobn != len(rights) {
+ fmt.Printf("WriteMsgUnix = %d, %d; want 1, %d", n, oobn, len(rights))
+ return
+ }
+}
+
+// TestUnixRightsRoundtrip tests that UnixRights, ParseSocketControlMessage,
+// and ParseUnixRights are able to successfully round-trip lists of file descriptors.
+func TestUnixRightsRoundtrip(t *testing.T) {
+ testCases := [...][][]int{
+ {{42}},
+ {{1, 2}},
+ {{3, 4, 5}},
+ {{}},
+ {{1, 2}, {3, 4, 5}, {}, {7}},
+ }
+ for _, testCase := range testCases {
+ b := []byte{}
+ var n int
+ for _, fds := range testCase {
+ // Last assignment to n wins
+ n = len(b) + syscall.CmsgLen(4*len(fds))
+ b = append(b, syscall.UnixRights(fds...)...)
+ }
+ // Truncate b
+ b = b[:n]
+
+ scms, err := syscall.ParseSocketControlMessage(b)
+ if err != nil {
+ t.Fatalf("ParseSocketControlMessage: %v", err)
+ }
+ if len(scms) != len(testCase) {
+ t.Fatalf("expected %v SocketControlMessage; got scms = %#v", len(testCase), scms)
+ }
+ for i, scm := range scms {
+ gotFds, err := syscall.ParseUnixRights(&scm)
+ if err != nil {
+ t.Fatalf("ParseUnixRights: %v", err)
+ }
+ wantFds := testCase[i]
+ if len(gotFds) != len(wantFds) {
+ t.Fatalf("expected %v fds, got %#v", len(wantFds), gotFds)
+ }
+ for j, fd := range gotFds {
+ if fd != wantFds[j] {
+ t.Fatalf("expected fd %v, got %v", wantFds[j], fd)
+ }
+ }
+ }
+ }
+}
+
+func TestRlimit(t *testing.T) {
+ if runtime.GOOS == "hurd" {
+ t.Skip("skipping; {set,get}rlimit not implemented on GNU/Hurd")
+ }
+ var rlimit, zero syscall.Rlimit
+ err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rlimit)
+ if err != nil {
+ t.Fatalf("Getrlimit: save failed: %v", err)
+ }
+ if zero == rlimit {
+ t.Fatalf("Getrlimit: save failed: got zero value %#v", rlimit)
+ }
+ set := rlimit
+ set.Cur = set.Max - 1
+ err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &set)
+ if err != nil {
+ t.Fatalf("Setrlimit: set failed: %#v %v", set, err)
+ }
+ var get syscall.Rlimit
+ err = syscall.Getrlimit(syscall.RLIMIT_NOFILE, &get)
+ if err != nil {
+ t.Fatalf("Getrlimit: get failed: %v", err)
+ }
+ set = rlimit
+ set.Cur = set.Max - 1
+ if set != get {
+ t.Fatalf("Rlimit: change failed: wanted %#v got %#v", set, get)
+ }
+ err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rlimit)
+ if err != nil {
+ t.Fatalf("Setrlimit: restore failed: %#v %v", rlimit, err)
+ }
+}
+
+func TestSeekFailure(t *testing.T) {
+ _, err := syscall.Seek(-1, 0, io.SeekStart)
+ if err == nil {
+ t.Fatalf("Seek(-1, 0, 0) did not fail")
+ }
+ str := err.Error() // used to crash on Linux
+ t.Logf("Seek: %v", str)
+ if str == "" {
+ t.Fatalf("Seek(-1, 0, 0) return error with empty message")
+ }
+}
Index: gcc-9-9-20190125-2.1/src/libgo/go/os/os_test.go
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/go/os/os_test.go
+++ gcc-9-9-20190125-2.1/src/libgo/go/os/os_test.go
@@ -1336,6 +1336,10 @@ func TestSeek(t *testing.T) {
t.Logf("skipping test case #%d on nacl; https://golang.org/issue/21728", i)
continue
}
+ if runtime.GOOS == "hurd" && tt.out > 1<<32 {
+ t.Logf("skipping test case #%d on Hurd: file too large", i)
+ continue
+ }
off, err := f.Seek(tt.in, tt.whence)
if off != tt.out || err != nil {
if e, ok := err.(*PathError); ok && e.Err == syscall.EINVAL && tt.out > 1<<32 && runtime.GOOS == "linux" {
[-- Attachment #13: src_libgo_runtime.diff --]
[-- Type: text/x-patch, Size: 712 bytes --]
libgo/ChangeLog
2018-10-20 Svante Signell <svante.signell@gmail.com>
* libgo/go/runtime/getncpu-hurd.c: New file, identical to
getncpu-solaris.c
Index: gcc-9-9-20190125-2.1/src/libgo/runtime/getncpu-hurd.c
===================================================================
--- /dev/null
+++ gcc-9-9-20190125-2.1/src/libgo/runtime/getncpu-hurd.c
@@ -0,0 +1,16 @@
+// Copyright 2012 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.
+
+#include <unistd.h>
+
+#include "runtime.h"
+#include "defs.h"
+
+int32
+getproccount(void)
+{
+ int32 n;
+ n = (int32)sysconf(_SC_NPROCESSORS_ONLN);
+ return n > 1 ? n : 1;
+}
[-- Attachment #14: src_libgo_testsuite_gotest.diff --]
[-- Type: text/x-patch, Size: 910 bytes --]
libgo/ChangeLog
2018-10-20 Svante Signell <svante.signell@gmail.com>
* libgo/testsuite/gotest: Remove ps -o comm option for GNU/Hurd.
Index: gcc-9-9-20190125-2.1/src/libgo/testsuite/gotest
===================================================================
--- gcc-9-9-20190125-2.1.orig/src/libgo/testsuite/gotest
+++ gcc-9-9-20190125-2.1/src/libgo/testsuite/gotest
@@ -650,7 +650,11 @@ xno)
wait $pid
status=$?
if ! test -f gotest-timeout; then
- sleeppid=`ps -o pid,ppid,comm | grep " $alarmpid " | grep sleep | sed -e 's/ *\([0-9]*\) .*$/\1/'`
+ if test "$goos" = "hurd"; then
+ sleeppid=`ps -o pid,ppid | grep " $alarmpid " | grep sleep | sed -e 's/ *\([0-9]*\) .*$/\1/'`
+ else
+ sleeppid=`ps -o pid,ppid,comm | grep " $alarmpid " | grep sleep | sed -e 's/ *\([0-9]*\) .*$/\1/'`
+ fi
kill $alarmpid
wait $alarmpid
if test "$sleeppid" != ""; then
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Updated patches for the port of gccgo to GNU/Hurd
2019-01-31 15:44 [PATCH] Updated patches for the port of gccgo to GNU/Hurd Svante Signell
@ 2019-02-07 5:04 ` Ian Lance Taylor
2019-02-08 23:07 ` Matthias Klose
0 siblings, 1 reply; 13+ messages in thread
From: Ian Lance Taylor @ 2019-02-07 5:04 UTC (permalink / raw)
To: svante.signell; +Cc: gcc-patches, Matthias Klose
On Thu, Jan 31, 2019 at 7:40 AM Svante Signell <svante.signell@gmail.com> wrote:
>
> As advised by the Debian gcc maintainer Matthias Klose and golang
> developer Ian Lance Taylor I'm re-submitting the patches for
> the port of gccgo to GNU/Hurd again. Now GOOS value is changed from gnu
> to hurd as requested.
>
> The 12 patches are:
> src_libgo_build.diff
> src_libgo_runtime.diff
> src_libgo_go_crypto.diff
> src_libgo_go_internal.diff
> src_libgo_go_net.diff
> src_libgo_go_os.diff
> src_libgo_go_runtime.diff
> src_libgo_go_syscall.diff
> src_libgo_go_test.diff
>
> src_libgo_testsuite_gotest.diff
> add-hurd-to-libgo-headers.diff
> add-hurd-to-libgo-test-headers.diff
Thanks. I've committed versions of all of these patches other than
src_libgo_testsuite_gotest.diff. I omitted that one because as far as
I can tell it won't work. While the original code may not run on the
Hurd, the modified version won't work.
I made various changes, and I'm sure I broke some things. Take a look
at GCC trunk and see how it seems.
Ian
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Updated patches for the port of gccgo to GNU/Hurd
2019-02-07 5:04 ` Ian Lance Taylor
@ 2019-02-08 23:07 ` Matthias Klose
2019-02-09 22:41 ` Ian Lance Taylor
0 siblings, 1 reply; 13+ messages in thread
From: Matthias Klose @ 2019-02-08 23:07 UTC (permalink / raw)
To: Ian Lance Taylor, svante.signell; +Cc: gcc-patches
On 07.02.19 06:04, Ian Lance Taylor wrote:
> On Thu, Jan 31, 2019 at 7:40 AM Svante Signell <svante.signell@gmail.com> wrote:
>>
>> As advised by the Debian gcc maintainer Matthias Klose and golang
>> developer Ian Lance Taylor I'm re-submitting the patches for
>> the port of gccgo to GNU/Hurd again. Now GOOS value is changed from gnu
>> to hurd as requested.
>>
>> The 12 patches are:
>> src_libgo_build.diff
>> src_libgo_runtime.diff
>> src_libgo_go_crypto.diff
>> src_libgo_go_internal.diff
>> src_libgo_go_net.diff
>> src_libgo_go_os.diff
>> src_libgo_go_runtime.diff
>> src_libgo_go_syscall.diff
>> src_libgo_go_test.diff
>>
>> src_libgo_testsuite_gotest.diff
>> add-hurd-to-libgo-headers.diff
>> add-hurd-to-libgo-test-headers.diff
>
> Thanks. I've committed versions of all of these patches other than
> src_libgo_testsuite_gotest.diff. I omitted that one because as far as
> I can tell it won't work. While the original code may not run on the
> Hurd, the modified version won't work.
>
> I made various changes, and I'm sure I broke some things. Take a look
> at GCC trunk and see how it seems.
libtool: compile: /<<PKGBUILDDIR>>/build/./gcc/gccgo
-B/<<PKGBUILDDIR>>/build/./gcc/ -B/usr/i686-gnu/bin/ -B/usr/i6
86-gnu/lib/ -isystem /usr/i686-gnu/include -isystem /usr/i686-gnu/sys-include
-isystem /<<PKGBUILDDIR>>/build/sys-in
clude -fchecking=1 -minline-all-stringops -O2 -g -I . -c -fgo-pkgpath=syscall
-fPIC -o .libs/syscall.o
gccgo: fatal error: no input files
compilation terminated.
Makefile:2844: recipe for target 'syscall.lo' failed
make[6]: *** [syscall.lo] Error 1
make[6]: Leaving directory '/<<PKGBUILDDIR>>/build/i686-gnu/libgo'
Makefile:2242: recipe for target 'all-recursive' failed
make[5]: *** [all-recursive] Error 1
make[5]: Leaving directory '/<<PKGBUILDDIR>>/build/i686-gnu/libgo'
Makefile:1167: recipe for target 'all' failed
make[4]: *** [all] Error 2
make[4]: Leaving directory '/<<PKGBUILDDIR>>/build/i686-gnu/libgo'
Makefile:20078: recipe for target 'all-target-libgo' failed
make[3]: *** [all-target-libgo] Error 2
make[3]: Leaving directory '/<<PKGBUILDDIR>>/build'
Makefile:24129: recipe for target 'bootstrap' failed
make[2]: *** [bootstrap] Error 2
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Updated patches for the port of gccgo to GNU/Hurd
2019-02-08 23:07 ` Matthias Klose
@ 2019-02-09 22:41 ` Ian Lance Taylor
2019-02-09 22:57 ` Svante Signell
0 siblings, 1 reply; 13+ messages in thread
From: Ian Lance Taylor @ 2019-02-09 22:41 UTC (permalink / raw)
To: Matthias Klose; +Cc: svante.signell, gcc-patches
On Fri, Feb 8, 2019 at 3:07 PM Matthias Klose <doko@debian.org> wrote:
>
> On 07.02.19 06:04, Ian Lance Taylor wrote:
> > On Thu, Jan 31, 2019 at 7:40 AM Svante Signell <svante.signell@gmail.com> wrote:
> >>
> >> As advised by the Debian gcc maintainer Matthias Klose and golang
> >> developer Ian Lance Taylor I'm re-submitting the patches for
> >> the port of gccgo to GNU/Hurd again. Now GOOS value is changed from gnu
> >> to hurd as requested.
> >>
> >> The 12 patches are:
> >> src_libgo_build.diff
> >> src_libgo_runtime.diff
> >> src_libgo_go_crypto.diff
> >> src_libgo_go_internal.diff
> >> src_libgo_go_net.diff
> >> src_libgo_go_os.diff
> >> src_libgo_go_runtime.diff
> >> src_libgo_go_syscall.diff
> >> src_libgo_go_test.diff
> >>
> >> src_libgo_testsuite_gotest.diff
> >> add-hurd-to-libgo-headers.diff
> >> add-hurd-to-libgo-test-headers.diff
> >
> > Thanks. I've committed versions of all of these patches other than
> > src_libgo_testsuite_gotest.diff. I omitted that one because as far as
> > I can tell it won't work. While the original code may not run on the
> > Hurd, the modified version won't work.
> >
> > I made various changes, and I'm sure I broke some things. Take a look
> > at GCC trunk and see how it seems.
>
> libtool: compile: /<<PKGBUILDDIR>>/build/./gcc/gccgo
> -B/<<PKGBUILDDIR>>/build/./gcc/ -B/usr/i686-gnu/bin/ -B/usr/i6
> 86-gnu/lib/ -isystem /usr/i686-gnu/include -isystem /usr/i686-gnu/sys-include
> -isystem /<<PKGBUILDDIR>>/build/sys-in
> clude -fchecking=1 -minline-all-stringops -O2 -g -I . -c -fgo-pkgpath=syscall
> -fPIC -o .libs/syscall.o
> gccgo: fatal error: no input files
> compilation terminated.
> Makefile:2844: recipe for target 'syscall.lo' failed
> make[6]: *** [syscall.lo] Error 1
> make[6]: Leaving directory '/<<PKGBUILDDIR>>/build/i686-gnu/libgo'
> Makefile:2242: recipe for target 'all-recursive' failed
> make[5]: *** [all-recursive] Error 1
> make[5]: Leaving directory '/<<PKGBUILDDIR>>/build/i686-gnu/libgo'
> Makefile:1167: recipe for target 'all' failed
> make[4]: *** [all] Error 2
> make[4]: Leaving directory '/<<PKGBUILDDIR>>/build/i686-gnu/libgo'
> Makefile:20078: recipe for target 'all-target-libgo' failed
> make[3]: *** [all-target-libgo] Error 2
> make[3]: Leaving directory '/<<PKGBUILDDIR>>/build'
> Makefile:24129: recipe for target 'bootstrap' failed
> make[2]: *** [bootstrap] Error 2
What are the lines before that in the log? For some reason libtool is
being invoke with no source files. The lines before the failing line
should show an invocation of match.sh that determines the source
files.
Ian
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Updated patches for the port of gccgo to GNU/Hurd
2019-02-09 22:41 ` Ian Lance Taylor
@ 2019-02-09 22:57 ` Svante Signell
2019-02-10 11:40 ` Svante Signell
0 siblings, 1 reply; 13+ messages in thread
From: Svante Signell @ 2019-02-09 22:57 UTC (permalink / raw)
To: Ian Lance Taylor, Matthias Klose; +Cc: gcc-patches
On Sat, 2019-02-09 at 14:40 -0800, Ian Lance Taylor wrote:
> On Fri, Feb 8, 2019 at 3:07 PM Matthias Klose <doko@debian.org> wrote:
> > On 07.02.19 06:04, Ian Lance Taylor wrote:
> What are the lines before that in the log? For some reason libtool is
> being invoke with no source files. The lines before the failing line
> should show an invocation of match.sh that determines the source
> files.
Thanks for your job upstreaming the patches!
I've found some problems. Current problem is with the mksysinfo.sh patch. But
there are some other things missing. New patches will be submitted tomorrow.
Thanks!
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Updated patches for the port of gccgo to GNU/Hurd
2019-02-09 22:57 ` Svante Signell
@ 2019-02-10 11:40 ` Svante Signell
2019-02-11 6:09 ` Ian Lance Taylor
2019-02-12 0:16 ` Ian Lance Taylor
0 siblings, 2 replies; 13+ messages in thread
From: Svante Signell @ 2019-02-10 11:40 UTC (permalink / raw)
To: Ian Lance Taylor, Matthias Klose; +Cc: gcc-patches
[-- Attachment #1: Type: text/plain, Size: 1546 bytes --]
On Sat, 2019-02-09 at 23:57 +0100, Svante Signell wrote:
> On Sat, 2019-02-09 at 14:40 -0800, Ian Lance Taylor wrote:
> > On Fri, Feb 8, 2019 at 3:07 PM Matthias Klose <doko@debian.org> wrote:
> > > On 07.02.19 06:04, Ian Lance Taylor wrote:
> > What are the lines before that in the log? For some reason libtool is
> > being invoke with no source files. The lines before the failing line
> > should show an invocation of match.sh that determines the source
> > files.
>
> Thanks for your job upstreaming the patches!
>
> I've found some problems. Current problem is with the mksysinfo.sh patch. But
> there are some other things missing. New patches will be submitted tomorrow.
Attached are three additional patches needed to build libgo on GNU/Hurd:
src_libgo_mksysinfo.sh.diff
src_libgo_go_syscall_wait.c.diff
src_libgo_testsuite_gotest.diff
For the first patch, src_libgo_mksysinfo.sh.diff, I had to go back to the old
version, using sed -i -e. As written now ${fsid_to_dev} expands to
fsid_to_dev='-e '\''s/st_fsid/Dev/'\''' resulting in: "sed: -e expression #4,
char 1: unknown command: `''". Unfortunately, I have not yet been able to modify
the expansion omitting the single qoutes around the shell variable.
The second patch, src_libgo_go_syscall_wait.c.diff, is needed since WCONTINUED
is not defined and is needed for WIFCONTINUED to be defined in wait.h.
The third patch, src_libgo_testsuite_gotest.diff, is not strictly needed, but
running the tests the annoying text is displayed: "ps: comm: Unknown format
spec"
Thanks!
[-- Attachment #2: src_libgo_go_syscall_wait.c.diff --]
[-- Type: text/x-patch, Size: 455 bytes --]
Index: gcc-9-9-20190208/src/libgo/go/syscall/wait.c
===================================================================
--- gcc-9-9-20190208.orig/src/libgo/go/syscall/wait.c
+++ gcc-9-9-20190208/src/libgo/go/syscall/wait.c
@@ -8,6 +8,13 @@
OS-independent. */
#include <stdint.h>
+
+/* WCONTINUED is not defined on GNU/Hurd */
+#ifdef __GNU__
+#ifndef WCONTINUED
+#define WCONTINUED 0
+#endif
+#endif
#include <sys/wait.h>
#include "runtime.h"
[-- Attachment #3: src_libgo_mksysinfo.sh.diff --]
[-- Type: text/x-patch, Size: 857 bytes --]
Index: gcc-9-9-20190208/src/libgo/mksysinfo.sh
===================================================================
--- gcc-9-9-20190208.orig/src/libgo/mksysinfo.sh
+++ gcc-9-9-20190208/src/libgo/mksysinfo.sh
@@ -486,9 +486,8 @@ grep '^type _st_timespec ' gen-sysinfo.g
# Special treatment of struct stat st_dev for GNU/Hurd
# /usr/include/i386-gnu/bits/stat.h: #define st_dev st_fsid
-fsid_to_dev=
if grep 'define st_dev st_fsid' gen-sysinfo.go > /dev/null 2>&1; then
- fsid_to_dev="-e 's/st_fsid/Dev/'"
+ sed -i -e 's/; st_fsid/; st_dev/' gen-sysinfo.go
fi
# The stat type.
@@ -501,7 +500,6 @@ else
fi | sed -e 's/type _stat64/type Stat_t/' \
-e 's/type _stat/type Stat_t/' \
-e 's/st_dev/Dev/' \
- ${fsid_to_dev} \
-e 's/st_ino/Ino/g' \
-e 's/st_nlink/Nlink/' \
-e 's/st_mode/Mode/' \
[-- Attachment #4: src_libgo_testsuite_gotest.diff --]
[-- Type: text/x-patch, Size: 898 bytes --]
libgo/ChangeLog
2018-10-20 Svante Signell <svante.signell@gmail.com>
* libgo/testsuite/gotest: Remove ps -o comm option for GNU/Hurd.
Index: gcc-9-9-20190208/src/libgo/testsuite/gotest
===================================================================
--- gcc-9-9-20190208.orig/src/libgo/testsuite/gotest
+++ gcc-9-9-20190208/src/libgo/testsuite/gotest
@@ -650,7 +650,11 @@ xno)
wait $pid
status=$?
if ! test -f gotest-timeout; then
- sleeppid=`ps -o pid,ppid,comm | grep " $alarmpid " | grep sleep | sed -e 's/ *\([0-9]*\) .*$/\1/'`
+ if test "$goos" = "hurd"; then
+ sleeppid=`ps -o pid,ppid | grep " $alarmpid " | grep sleep | sed -e 's/ *\([0-9]*\) .*$/\1/'`
+ else
+ sleeppid=`ps -o pid,ppid,comm | grep " $alarmpid " | grep sleep | sed -e 's/ *\([0-9]*\) .*$/\1/'`
+ fi
kill $alarmpid
wait $alarmpid
if test "$sleeppid" != ""; then
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Updated patches for the port of gccgo to GNU/Hurd
2019-02-10 11:40 ` Svante Signell
@ 2019-02-11 6:09 ` Ian Lance Taylor
2019-02-11 11:10 ` Svante Signell
2019-02-12 0:16 ` Ian Lance Taylor
1 sibling, 1 reply; 13+ messages in thread
From: Ian Lance Taylor @ 2019-02-11 6:09 UTC (permalink / raw)
To: svante.signell; +Cc: Matthias Klose, gcc-patches
On Sun, Feb 10, 2019 at 3:41 AM Svante Signell <svante.signell@gmail.com> wrote:
>
> On Sat, 2019-02-09 at 23:57 +0100, Svante Signell wrote:
> > On Sat, 2019-02-09 at 14:40 -0800, Ian Lance Taylor wrote:
> > > On Fri, Feb 8, 2019 at 3:07 PM Matthias Klose <doko@debian.org> wrote:
> > > > On 07.02.19 06:04, Ian Lance Taylor wrote:
> > > What are the lines before that in the log? For some reason libtool is
> > > being invoke with no source files. The lines before the failing line
> > > should show an invocation of match.sh that determines the source
> > > files.
> >
> > Thanks for your job upstreaming the patches!
> >
> > I've found some problems. Current problem is with the mksysinfo.sh patch. But
> > there are some other things missing. New patches will be submitted tomorrow.
>
> Attached are three additional patches needed to build libgo on GNU/Hurd:
> src_libgo_mksysinfo.sh.diff
> src_libgo_go_syscall_wait.c.diff
> src_libgo_testsuite_gotest.diff
>
> For the first patch, src_libgo_mksysinfo.sh.diff, I had to go back to the old
> version, using sed -i -e. As written now ${fsid_to_dev} expands to
> fsid_to_dev='-e '\''s/st_fsid/Dev/'\''' resulting in: "sed: -e expression #4,
> char 1: unknown command: `''". Unfortunately, I have not yet been able to modify
> the expansion omitting the single qoutes around the shell variable.
I'm sorry, I don't want to use "sed -i". That loses the original file
and makes it harder to reconstruct what has happened.
> The second patch, src_libgo_go_syscall_wait.c.diff, is needed since WCONTINUED
> is not defined and is needed for WIFCONTINUED to be defined in wait.h.
I don't understand that. <sys/wait.h> is a system header file. Are
you saying that it is impossible to use <sys/wait.h> and WIFCONTINUED
unless your source code does a #define WCONTINUED before #include'ing
<sys/wait.h>? That seems like a bug in the Hurd library code.
> The third patch, src_libgo_testsuite_gotest.diff, is not strictly needed, but
> running the tests the annoying text is displayed: "ps: comm: Unknown format
> spec"
I get that "comm" doesn't work, but the change in that patch is simply
incorrect. If you don't pass "comm", the "grep sleep" will never
succeed. If there is no way to support this code on Hurd then we
should skip it, not put in a command that can never work.
Ian
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Updated patches for the port of gccgo to GNU/Hurd
2019-02-11 6:09 ` Ian Lance Taylor
@ 2019-02-11 11:10 ` Svante Signell
2019-02-11 18:27 ` Ian Lance Taylor
2019-02-11 18:38 ` Samuel Thibault
0 siblings, 2 replies; 13+ messages in thread
From: Svante Signell @ 2019-02-11 11:10 UTC (permalink / raw)
To: Ian Lance Taylor; +Cc: Matthias Klose, gcc-patches, Samuel Thibault
On Sun, 2019-02-10 at 22:08 -0800, Ian Lance Taylor wrote:
> On Sun, Feb 10, 2019 at 3:41 AM Svante Signell <svante.signell@gmail.com>
> wrote:
> > On Sat, 2019-02-09 at 23:57 +0100, Svante Signell wrote:
> > > On Sat, 2019-02-09 at 14:40 -0800, Ian Lance Taylor wrote:
> > > > On Fri, Feb 8, 2019 at 3:07 PM Matthias Klose <doko@debian.org> wrote:
> > > > > On 07.02.19 06:04, Ian Lance Taylor wrote:
> > > > What are the lines before that in the log? For some reason libtool is
> > > > being invoke with no source files. The lines before the failing line
> > > > should show an invocation of match.sh that determines the source
> > > > files.
> > >
> > > Thanks for your job upstreaming the patches!
> > >
> > > I've found some problems. Current problem is with the mksysinfo.sh patch.
> > > But there are some other things missing. New patches will be submitted
> > > tomorrow.
> >
> > Attached are three additional patches needed to build libgo on GNU/Hurd:
> > src_libgo_mksysinfo.sh.diff
> > src_libgo_go_syscall_wait.c.diff
> > src_libgo_testsuite_gotest.diff
> >
> > For the first patch, src_libgo_mksysinfo.sh.diff, I had to go back to the
> > old version, using sed -i -e. As written now ${fsid_to_dev} expands to
> > fsid_to_dev='-e '\''s/st_fsid/Dev/'\''' resulting in: "sed: -e expression
> > #4, char 1: unknown command: `''". Unfortunately, I have not yet been able
> > to modify the expansion omitting the single qoutes around the shell
> > variable.
>
> I'm sorry, I don't want to use "sed -i". That loses the original file
> and makes it harder to reconstruct what has happened.
What to do then?
> > The second patch, src_libgo_go_syscall_wait.c.diff, is needed since
> > WCONTINUED is not defined and is needed for WIFCONTINUED to be defined in
> > wait.h.
>
> I don't understand that. <sys/wait.h> is a system header file. Are
> you saying that it is impossible to use <sys/wait.h> and WIFCONTINUED
> unless your source code does a #define WCONTINUED before #include'ing
> <sys/wait.h>? That seems like a bug in the Hurd library code.
The problem is that WCONTINUED is not defined in /usr/include/i386-
gnu/bits/waitflags.h on Hurd. Only WNOHANG and WUNTRACED are. That causes
WIFCONTINUED not to be defined in /usr/include/i386-gnu/bits/waitstatus.h. As
WCONTINUED is not defined, I assume that WIFCONTINUED is not supported.
From waitpid(2):
WCONTINUED (since Linux 2.6.10)
also return if a stopped child has been resumed by delivery of SIGCONT.
@Samuel: more info?
I think that that call to WIFCONTINUED in libgo/go/syscall/wait.c
_Bool
Continued (uint32_t *w)
{
return WIFCONTINUED (*w) != 0;
}
has to be omitted somehow for Hurd.
> > The third patch, src_libgo_testsuite_gotest.diff, is not strictly needed,
> > but running the tests the annoying text is displayed: "ps: comm: Unknown
> > format spec"
>
> I get that "comm" doesn't work, but the change in that patch is simply
> incorrect. If you don't pass "comm", the "grep sleep" will never
> succeed. If there is no way to support this code on Hurd then we
> should skip it, not put in a command that can never work.
OK, let's drop that part then.
@Samuel: more info?
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Updated patches for the port of gccgo to GNU/Hurd
2019-02-11 11:10 ` Svante Signell
@ 2019-02-11 18:27 ` Ian Lance Taylor
2019-02-11 21:38 ` Svante Signell
2019-02-11 18:38 ` Samuel Thibault
1 sibling, 1 reply; 13+ messages in thread
From: Ian Lance Taylor @ 2019-02-11 18:27 UTC (permalink / raw)
To: svante.signell; +Cc: Matthias Klose, gcc-patches, Samuel Thibault
On Mon, Feb 11, 2019 at 3:10 AM Svante Signell <svante.signell@gmail.com> wrote:
>
> On Sun, 2019-02-10 at 22:08 -0800, Ian Lance Taylor wrote:
> > On Sun, Feb 10, 2019 at 3:41 AM Svante Signell <svante.signell@gmail.com>
> > wrote:
> > > On Sat, 2019-02-09 at 23:57 +0100, Svante Signell wrote:
> > > > On Sat, 2019-02-09 at 14:40 -0800, Ian Lance Taylor wrote:
> > > > > On Fri, Feb 8, 2019 at 3:07 PM Matthias Klose <doko@debian.org> wrote:
> > > > > > On 07.02.19 06:04, Ian Lance Taylor wrote:
> > > > > What are the lines before that in the log? For some reason libtool is
> > > > > being invoke with no source files. The lines before the failing line
> > > > > should show an invocation of match.sh that determines the source
> > > > > files.
> > > >
> > > > Thanks for your job upstreaming the patches!
> > > >
> > > > I've found some problems. Current problem is with the mksysinfo.sh patch.
> > > > But there are some other things missing. New patches will be submitted
> > > > tomorrow.
> > >
> > > Attached are three additional patches needed to build libgo on GNU/Hurd:
> > > src_libgo_mksysinfo.sh.diff
> > > src_libgo_go_syscall_wait.c.diff
> > > src_libgo_testsuite_gotest.diff
> > >
> > > For the first patch, src_libgo_mksysinfo.sh.diff, I had to go back to the
> > > old version, using sed -i -e. As written now ${fsid_to_dev} expands to
> > > fsid_to_dev='-e '\''s/st_fsid/Dev/'\''' resulting in: "sed: -e expression
> > > #4, char 1: unknown command: `''". Unfortunately, I have not yet been able
> > > to modify the expansion omitting the single qoutes around the shell
> > > variable.
> >
> > I'm sorry, I don't want to use "sed -i". That loses the original file
> > and makes it harder to reconstruct what has happened.
>
> What to do then?
>
> > > The second patch, src_libgo_go_syscall_wait.c.diff, is needed since
> > > WCONTINUED is not defined and is needed for WIFCONTINUED to be defined in
> > > wait.h.
> >
> > I don't understand that. <sys/wait.h> is a system header file. Are
> > you saying that it is impossible to use <sys/wait.h> and WIFCONTINUED
> > unless your source code does a #define WCONTINUED before #include'ing
> > <sys/wait.h>? That seems like a bug in the Hurd library code.
>
> The problem is that WCONTINUED is not defined in /usr/include/i386-
> gnu/bits/waitflags.h on Hurd. Only WNOHANG and WUNTRACED are. That causes
> WIFCONTINUED not to be defined in /usr/include/i386-gnu/bits/waitstatus.h. As
> WCONTINUED is not defined, I assume that WIFCONTINUED is not supported.
>
> From waitpid(2):
> WCONTINUED (since Linux 2.6.10)
> also return if a stopped child has been resumed by delivery of SIGCONT.
>
> @Samuel: more info?
>
> I think that that call to WIFCONTINUED in libgo/go/syscall/wait.c
> _Bool
> Continued (uint32_t *w)
> {
> return WIFCONTINUED (*w) != 0;
> }
>
> has to be omitted somehow for Hurd.
It sound like the right fix is to use #ifdef WIFCONTINUED in
syscall/wait.c. If WIFCONTINUED is not defined, the Continued
function should always return 0.
Ian
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Updated patches for the port of gccgo to GNU/Hurd
2019-02-11 11:10 ` Svante Signell
2019-02-11 18:27 ` Ian Lance Taylor
@ 2019-02-11 18:38 ` Samuel Thibault
1 sibling, 0 replies; 13+ messages in thread
From: Samuel Thibault @ 2019-02-11 18:38 UTC (permalink / raw)
To: Svante Signell; +Cc: Ian Lance Taylor, Matthias Klose, gcc-patches, bug-hurd
Svante Signell, le lun. 11 févr. 2019 12:10:21 +0100, a ecrit:
> WCONTINUED is not defined, I assume that WIFCONTINUED is not supported.
>
> From waitpid(2):
> WCONTINUED (since Linux 2.6.10)
> also return if a stopped child has been resumed by delivery of SIGCONT.
>
> @Samuel: more info?
git grep WCONTINUED .
yields nothing in hurd/proc, so it's probably just not supported yet
indeed.
> > > The third patch, src_libgo_testsuite_gotest.diff, is not strictly needed,
> > > but running the tests the annoying text is displayed: "ps: comm: Unknown
> > > format spec"
> >
> > I get that "comm" doesn't work, but the change in that patch is simply
> > incorrect. If you don't pass "comm", the "grep sleep" will never
> > succeed. If there is no way to support this code on Hurd then we
> > should skip it, not put in a command that can never work.
>
> OK, let's drop that part then.
>
> @Samuel: more info?
arg0 can be used instead.
That said, we should implement comm since it's defined by posix, it's
probably a matter of duplicating the line "Arg0" in hurd/libps/spec.c
Samuel
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Updated patches for the port of gccgo to GNU/Hurd
2019-02-11 18:27 ` Ian Lance Taylor
@ 2019-02-11 21:38 ` Svante Signell
2019-02-12 21:30 ` Ian Lance Taylor
0 siblings, 1 reply; 13+ messages in thread
From: Svante Signell @ 2019-02-11 21:38 UTC (permalink / raw)
To: Ian Lance Taylor; +Cc: Matthias Klose, gcc-patches, Samuel Thibault
On Mon, 2019-02-11 at 10:27 -0800, Ian Lance Taylor wrote:
> On Mon, Feb 11, 2019 at 3:10 AM Svante Signell <svante.signell@gmail.com>
> wrote:
> > On Sun, 2019-02-10 at 22:08 -0800, Ian Lance Taylor wrote:
> > > On Sun, Feb 10, 2019 at 3:41 AM Svante Signell <svante.signell@gmail.com>
> > > wrote:
> > > > On Sat, 2019-02-09 at 23:57 +0100, Svante Signell wrote:
> > > > > On Sat, 2019-02-09 at 14:40 -0800, Ian Lance Taylor wrote:
> > > > > > On Fri, Feb 8, 2019 at 3:07 PM Matthias Klose <doko@debian.org>
> > > > > > wrote:
> > > > > > > On 07.02.19 06:04, Ian Lance Taylor wrote:
> > > > > > What are the lines before that in the log? For some reason libtool
> > > > > > is
> > > > > > being invoke with no source files. The lines before the failing
> > > > > > line
> > > > > > should show an invocation of match.sh that determines the source
> > > > > > files.
> > > > >
> > > > > Thanks for your job upstreaming the patches!
> > > > >
> > > > > I've found some problems. Current problem is with the mksysinfo.sh
> > > > > patch.
> > > > > But there are some other things missing. New patches will be submitted
> > > > > tomorrow.
> > > >
> > > > Attached are three additional patches needed to build libgo on GNU/Hurd:
> > > > src_libgo_mksysinfo.sh.diff
> > > > src_libgo_go_syscall_wait.c.diff
> > > > src_libgo_testsuite_gotest.diff
> > > >
> > > > For the first patch, src_libgo_mksysinfo.sh.diff, I had to go back to
> > > > the
> > > > old version, using sed -i -e. As written now ${fsid_to_dev} expands to
> > > > fsid_to_dev='-e '\''s/st_fsid/Dev/'\''' resulting in: "sed: -e
> > > > expression
> > > > #4, char 1: unknown command: `''". Unfortunately, I have not yet been
> > > > able
> > > > to modify the expansion omitting the single qoutes around the shell
> > > > variable.
> > >
> > > I'm sorry, I don't want to use "sed -i". That loses the original file
> > > and makes it harder to reconstruct what has happened.
> >
> > What to do then?
> >
> > > > The second patch, src_libgo_go_syscall_wait.c.diff, is needed since
> > > > WCONTINUED is not defined and is needed for WIFCONTINUED to be defined
> > > > in
> > > > wait.h.
> > >
> > > I don't understand that. <sys/wait.h> is a system header file. Are
> > > you saying that it is impossible to use <sys/wait.h> and WIFCONTINUED
> > > unless your source code does a #define WCONTINUED before #include'ing
> > > <sys/wait.h>? That seems like a bug in the Hurd library code.
> >
> > The problem is that WCONTINUED is not defined in /usr/include/i386-
> > gnu/bits/waitflags.h on Hurd. Only WNOHANG and WUNTRACED are. That causes
> > WIFCONTINUED not to be defined in /usr/include/i386-gnu/bits/waitstatus.h.
> > As
> > WCONTINUED is not defined, I assume that WIFCONTINUED is not supported.
> >
> > From waitpid(2):
> > WCONTINUED (since Linux 2.6.10)
> > also return if a stopped child has been resumed by delivery of SIGCONT.
> >
> > @Samuel: more info?
> >
> > I think that that call to WIFCONTINUED in libgo/go/syscall/wait.c
> > _Bool
> > Continued (uint32_t *w)
> > {
> > return WIFCONTINUED (*w) != 0;
> > }
> >
> > has to be omitted somehow for Hurd.
>
> It sound like the right fix is to use #ifdef WIFCONTINUED in
> syscall/wait.c. If WIFCONTINUED is not defined, the Continued
> function should always return 0.
I've got some ideas on how to solve the mksysinfo.sh problem. I just don't have
time to try it out now. The idea is:
fsid_to_dev='s/st_dev/Dev/'
if grep 'define st_dev st_fsid' gen-sysinfo.go > /dev/null 2>&1; then
fsid_to_dev='s/st_fsid/Dev/'
...
remove: -e 's/st_dev/Dev/' \
add: -e ${fsid_to_dev} \
I can also easily submit a patch for WIFCONTINUED returning 0. Problem is I'll
be AFK for the next week. Maybe this can wait, or you find a solution? Regardinga comm opttion for ps Samuel is the best source.
Thanks!
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Updated patches for the port of gccgo to GNU/Hurd
2019-02-10 11:40 ` Svante Signell
2019-02-11 6:09 ` Ian Lance Taylor
@ 2019-02-12 0:16 ` Ian Lance Taylor
1 sibling, 0 replies; 13+ messages in thread
From: Ian Lance Taylor @ 2019-02-12 0:16 UTC (permalink / raw)
To: svante.signell; +Cc: Matthias Klose, gcc-patches, gofrontend-dev
[-- Attachment #1: Type: text/plain, Size: 948 bytes --]
On Sun, Feb 10, 2019 at 3:40 AM Svante Signell <svante.signell@gmail.com> wrote:
>
> > I've found some problems. Current problem is with the mksysinfo.sh patch. But
> > there are some other things missing. New patches will be submitted tomorrow.
>
> Attached are three additional patches needed to build libgo on GNU/Hurd:
> src_libgo_mksysinfo.sh.diff
> src_libgo_go_syscall_wait.c.diff
> src_libgo_testsuite_gotest.diff
>
> For the first patch, src_libgo_mksysinfo.sh.diff, I had to go back to the old
> version, using sed -i -e. As written now ${fsid_to_dev} expands to
> fsid_to_dev='-e '\''s/st_fsid/Dev/'\''' resulting in: "sed: -e expression #4,
> char 1: unknown command: `''". Unfortunately, I have not yet been able to modify
> the expansion omitting the single qoutes around the shell variable.
I fixed this a slightly different way, as attached. Bootstrapped and
ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline.
Ian
[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 1292 bytes --]
Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE (revision 268605)
+++ gcc/go/gofrontend/MERGE (working copy)
@@ -1,4 +1,4 @@
-9b66264ed6adcf3fd215dbfd125c12b022b7280e
+fc8aa5a46433d6ecba9fd1cd0bee4290c314ca06
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
Index: libgo/mksysinfo.sh
===================================================================
--- libgo/mksysinfo.sh (revision 268461)
+++ libgo/mksysinfo.sh (working copy)
@@ -486,9 +486,9 @@ grep '^type _st_timespec ' gen-sysinfo.g
# Special treatment of struct stat st_dev for GNU/Hurd
# /usr/include/i386-gnu/bits/stat.h: #define st_dev st_fsid
-fsid_to_dev=
+st_dev='-e s/st_dev/Dev/'
if grep 'define st_dev st_fsid' gen-sysinfo.go > /dev/null 2>&1; then
- fsid_to_dev="-e 's/st_fsid/Dev/'"
+ st_dev='-e s/st_fsid/Dev/'
fi
# The stat type.
@@ -500,8 +500,7 @@ else
grep '^type _stat ' gen-sysinfo.go
fi | sed -e 's/type _stat64/type Stat_t/' \
-e 's/type _stat/type Stat_t/' \
- -e 's/st_dev/Dev/' \
- ${fsid_to_dev} \
+ ${st_dev} \
-e 's/st_ino/Ino/g' \
-e 's/st_nlink/Nlink/' \
-e 's/st_mode/Mode/' \
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Updated patches for the port of gccgo to GNU/Hurd
2019-02-11 21:38 ` Svante Signell
@ 2019-02-12 21:30 ` Ian Lance Taylor
0 siblings, 0 replies; 13+ messages in thread
From: Ian Lance Taylor @ 2019-02-12 21:30 UTC (permalink / raw)
To: svante.signell; +Cc: Matthias Klose, gcc-patches, Samuel Thibault
[-- Attachment #1: Type: text/plain, Size: 639 bytes --]
On Mon, Feb 11, 2019 at 1:38 PM Svante Signell <svante.signell@gmail.com> wrote:
>
> On Mon, 2019-02-11 at 10:27 -0800, Ian Lance Taylor wrote:
>
> > It sound like the right fix is to use #ifdef WIFCONTINUED in
> > syscall/wait.c. If WIFCONTINUED is not defined, the Continued
> > function should always return 0.
> I can also easily submit a patch for WIFCONTINUED returning 0. Problem is I'll
> be AFK for the next week. Maybe this can wait, or you find a solution? Regardinga comm opttion for ps Samuel is the best source.
I've committed this patch that should fix this problem. Bootstrapped
and tested on x86_64-pc-linux-gnu.
Ian
[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 825 bytes --]
Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE (revision 268785)
+++ gcc/go/gofrontend/MERGE (working copy)
@@ -1,4 +1,4 @@
-fc8aa5a46433d6ecba9fd1cd0bee4290c314ca06
+6d03c4c8ca320042bd550d44c0f25575c5311ac2
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
Index: libgo/go/syscall/wait.c
===================================================================
--- libgo/go/syscall/wait.c (revision 268369)
+++ libgo/go/syscall/wait.c (working copy)
@@ -16,6 +16,10 @@
#define WCOREDUMP(status) (((status) & 0200) != 0)
#endif
+#ifndef WIFCONTINUED
+#define WIFCONTINUED(x) 0
+#endif
+
extern _Bool Exited (uint32_t *w)
__asm__ (GOSYM_PREFIX "syscall.WaitStatus.Exited");
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2019-02-12 21:30 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-31 15:44 [PATCH] Updated patches for the port of gccgo to GNU/Hurd Svante Signell
2019-02-07 5:04 ` Ian Lance Taylor
2019-02-08 23:07 ` Matthias Klose
2019-02-09 22:41 ` Ian Lance Taylor
2019-02-09 22:57 ` Svante Signell
2019-02-10 11:40 ` Svante Signell
2019-02-11 6:09 ` Ian Lance Taylor
2019-02-11 11:10 ` Svante Signell
2019-02-11 18:27 ` Ian Lance Taylor
2019-02-11 21:38 ` Svante Signell
2019-02-12 21:30 ` Ian Lance Taylor
2019-02-11 18:38 ` Samuel Thibault
2019-02-12 0:16 ` Ian Lance Taylor
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).