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

From-SVN: r249599

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 473eeca22daaa9e4b848f221f4f9311be66f6dfc..eb58bbd2ae0ccfdf86dee316387de7aa3f3dc300 100644 (file)
--- 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 653fce92532508151053c4875d49ca8241e9746c..3337395510e421d8bfd305005e09603943b7dc05 100644 (file)
--- 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)