aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2017-06-23 07:08:56 -0700
committerIan Lance Taylor <iant@golang.org>2017-06-23 17:02:41 +0000
commitddeab538263307f6d76e3a8a7f2c4b12383b61bc (patch)
treee14bea78f9e5f74f27aa1ef45fb5a7bd35313cce
parentc23948a2b83bfbe21d2d721f38a7f18f737ba7bb (diff)
downloadgo-ddeab538263307f6d76e3a8a7f2c4b12383b61bc.tar.gz
go-ddeab538263307f6d76e3a8a7f2c4b12383b61bc.zip
os: align siginfo argument to waitid
I have no test case for this, but there is one report on the mailing list (https://groups.google.com/d/msg/golang-dev/sDg-t1_DPw0/-AJmLxgPBQAJ) in which waitid running on MIPS returns EFAULT. Change-Id: I79bde63c7427eefc1f2925d78d97cc9cf2fffde3 Reviewed-on: https://go-review.googlesource.com/46511 Run-TryBot: Ian Lance Taylor <iant@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
-rw-r--r--src/os/wait_waitid.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/os/wait_waitid.go b/src/os/wait_waitid.go
index a6c5c729d2..5a62b27f19 100644
--- a/src/os/wait_waitid.go
+++ b/src/os/wait_waitid.go
@@ -26,7 +26,7 @@ func (p *Process) blockUntilWaitable() (bool, error) {
// On Darwin, it requires greater than or equal to 64 bytes
// for darwin/{386,arm} and 104 bytes for darwin/amd64.
// We don't care about the values it returns.
- var siginfo [128]byte
+ var siginfo [16]uint64
psig := &siginfo[0]
_, _, e := syscall.Syscall6(syscall.SYS_WAITID, _P_PID, uintptr(p.Pid), uintptr(unsafe.Pointer(psig)), syscall.WEXITED|syscall.WNOWAIT, 0, 0)
runtime.KeepAlive(p)