diff options
| author | Michael Munday <munday@ca.ibm.com> | 2016-03-18 18:55:26 -0400 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2016-03-21 08:59:18 +0000 |
| commit | cd187e9102bd6c55bb611a0b0f35fc4a7e0fbc51 (patch) | |
| tree | 9c1fa4dc29900059bf634a454b19806058dea650 /src/syscall/exec_linux.go | |
| parent | 254d63baa78741fe415e58361ddc3e10a311458c (diff) | |
| download | go-cd187e9102bd6c55bb611a0b0f35fc4a7e0fbc51.tar.xz | |
syscall: change clone argument order on s390x
The Linux ABI takes arguments in a different order on s390x.
Change-Id: Ic9cfcc22a5ea3d8ef77d4dd0b915fc266ff3e5f7
Reviewed-on: https://go-review.googlesource.com/20960
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/syscall/exec_linux.go')
| -rw-r--r-- | src/syscall/exec_linux.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/syscall/exec_linux.go b/src/syscall/exec_linux.go index 0ea9283bf6..c1fd53cc6e 100644 --- a/src/syscall/exec_linux.go +++ b/src/syscall/exec_linux.go @@ -7,6 +7,7 @@ package syscall import ( + "runtime" "unsafe" ) @@ -93,7 +94,11 @@ func forkAndExecInChild(argv0 *byte, argv, envv []*byte, chroot, dir *byte, attr // About to call fork. // No more allocation or calls of non-assembly functions. runtime_BeforeFork() - r1, _, err1 = RawSyscall6(SYS_CLONE, uintptr(SIGCHLD)|sys.Cloneflags, 0, 0, 0, 0, 0) + if runtime.GOARCH == "s390x" { + r1, _, err1 = RawSyscall6(SYS_CLONE, 0, uintptr(SIGCHLD)|sys.Cloneflags, 0, 0, 0, 0) + } else { + r1, _, err1 = RawSyscall6(SYS_CLONE, uintptr(SIGCHLD)|sys.Cloneflags, 0, 0, 0, 0, 0) + } if err1 != 0 { runtime_AfterFork() return 0, err1 |