diff options
| -rw-r--r-- | src/syscall/asm_linux_arm64.s | 23 | ||||
| -rw-r--r-- | src/syscall/exec_linux.go | 2 | ||||
| -rw-r--r-- | src/syscall/syscall_linux_arm64.go | 4 |
3 files changed, 25 insertions, 4 deletions
diff --git a/src/syscall/asm_linux_arm64.s b/src/syscall/asm_linux_arm64.s index 7edeafca81..fb22f8d547 100644 --- a/src/syscall/asm_linux_arm64.s +++ b/src/syscall/asm_linux_arm64.s @@ -103,6 +103,29 @@ ok: MOVD ZR, err+72(FP) // errno RET +// func rawVforkSyscall(trap, a1 uintptr) (r1, err uintptr) +TEXT ·rawVforkSyscall(SB),NOSPLIT,$0-32 + MOVD a1+8(FP), R0 + MOVD $0, R1 + MOVD $0, R2 + MOVD $0, R3 + MOVD $0, R4 + MOVD $0, R5 + MOVD trap+0(FP), R8 // syscall entry + SVC + CMN $4095, R0 + BCC ok + MOVD $-1, R4 + MOVD R4, r1+16(FP) // r1 + NEG R0, R0 + MOVD R0, err+24(FP) // errno + RET +ok: + MOVD R0, r1+16(FP) // r1 + MOVD ZR, err+24(FP) // errno + RET + + // func rawSyscallNoError(trap uintptr, a1, a2, a3 uintptr) (r1, r2 uintptr); TEXT ·rawSyscallNoError(SB),NOSPLIT,$0-48 MOVD a1+8(FP), R0 diff --git a/src/syscall/exec_linux.go b/src/syscall/exec_linux.go index a2242b2057..3540d511bf 100644 --- a/src/syscall/exec_linux.go +++ b/src/syscall/exec_linux.go @@ -196,7 +196,7 @@ func forkAndExecInChild1(argv0 *byte, argv, envv []*byte, chroot, dir *byte, att } } - hasRawVforkSyscall := runtime.GOARCH == "amd64" || runtime.GOARCH == "ppc64" || runtime.GOARCH == "s390x" + hasRawVforkSyscall := runtime.GOARCH == "amd64" || runtime.GOARCH == "ppc64" || runtime.GOARCH == "s390x" || runtime.GOARCH == "arm64" // About to call fork. // No more allocation or calls of non-assembly functions. diff --git a/src/syscall/syscall_linux_arm64.go b/src/syscall/syscall_linux_arm64.go index 1ea48892ba..95065bfe2d 100644 --- a/src/syscall/syscall_linux_arm64.go +++ b/src/syscall/syscall_linux_arm64.go @@ -155,6 +155,4 @@ const ( SYS_EPOLL_WAIT = 1069 ) -func rawVforkSyscall(trap, a1 uintptr) (r1 uintptr, err Errno) { - panic("not implemented") -} +func rawVforkSyscall(trap, a1 uintptr) (r1 uintptr, err Errno) |