diff options
Diffstat (limited to 'libgo/go/os/wait_wait6.go')
| -rw-r--r-- | libgo/go/os/wait_wait6.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libgo/go/os/wait_wait6.go b/libgo/go/os/wait_wait6.go index 5420b2d..45b370a 100644 --- a/libgo/go/os/wait_wait6.go +++ b/libgo/go/os/wait_wait6.go @@ -2,7 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build freebsd +//go:build dragonfly || freebsd || netbsd +// +build dragonfly freebsd netbsd package os @@ -22,9 +23,9 @@ func (p *Process) blockUntilWaitable() (bool, error) { // The arguments on 32-bit FreeBSD look like the following: // - freebsd32_wait6_args{ idtype, id1, id2, status, options, wrusage, info } or // - freebsd32_wait6_args{ idtype, pad, id1, id2, status, options, wrusage, info } when PAD64_REQUIRED=1 on ARM, MIPS or PowerPC - if runtime.GOARCH == "386" { + if runtime.GOOS == "freebsd" && runtime.GOARCH == "386" { _, _, errno = syscall.Syscall9(syscall.SYS_WAIT6, _P_PID, uintptr(p.Pid), 0, 0, syscall.WEXITED|syscall.WNOWAIT, 0, 0, 0, 0) - } else if runtime.GOARCH == "arm" { + } else if runtime.GOOS == "freebsd" && runtime.GOARCH == "arm" { _, _, errno = syscall.Syscall9(syscall.SYS_WAIT6, _P_PID, 0, uintptr(p.Pid), 0, 0, syscall.WEXITED|syscall.WNOWAIT, 0, 0, 0) } else { _, _, errno = syscall.Syscall6(syscall.SYS_WAIT6, _P_PID, uintptr(p.Pid), 0, syscall.WEXITED|syscall.WNOWAIT, 0, 0) @@ -34,7 +35,9 @@ func (p *Process) blockUntilWaitable() (bool, error) { } } runtime.KeepAlive(p) - if errno != 0 { + if errno == syscall.ENOSYS { + return false, nil + } else if errno != 0 { return false, NewSyscallError("wait6", errno) } return true, nil |