diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-06-23 17:10:18 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-06-23 17:10:18 +0000 |
| commit | dd518dd73716de0e780829de966b3128c9f6a4ca (patch) | |
| tree | b0b7c2314956f85f7d719076c18e235f58fe1484 | |
| parent | 7323f700290516869bece089703359f2e8a55f8b (diff) | |
| download | gcc-dd518dd73716de0e780829de966b3128c9f6a4ca.tar.gz | |
os: align siginfo argument to waitid
Backport https://golang.org/cl/46511 from gc trunk, as it may fix a
bug reported for gccgo running on MIPS
(https://groups.google.com/d/msg/golang-dev/sDg-t1_DPw0/-AJmLxgPBQAJ).
Reviewed-on: https://go-review.googlesource.com/46571
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@249599 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/os/wait_waitid.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 473eeca22da..eb58bbd2ae0 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -f107cc8bced1939b0083231fc1ea24669ca4832c +c49ba1ca392b3c23a4b3934e0a95a908b1dc2f1d The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/os/wait_waitid.go b/libgo/go/os/wait_waitid.go index 653fce92532..3337395510e 100644 --- a/libgo/go/os/wait_waitid.go +++ b/libgo/go/os/wait_waitid.go @@ -23,7 +23,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) |