diff options
| author | Russ Cox <rsc@golang.org> | 2020-12-22 16:54:51 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2020-12-22 16:55:15 -0500 |
| commit | ec741b04470cda8df5902f1d8d84ab15cb2c8b8b (patch) | |
| tree | 06682f85c7951b2a94423c01ea6008af4d558053 /src/syscall/syscall_darwin_arm64.go | |
| parent | acc32ea124957ad4b097186fb2f6da8122a9a5d1 (diff) | |
| parent | c9fb4eb0a22131cc9922fa96afba01d4e21d4fd4 (diff) | |
| download | go-ec741b04470cda8df5902f1d8d84ab15cb2c8b8b.tar.xz | |
[dev.regabi] all: merge master (c9fb4eb) into dev.regabi
Merge List:
* 2020-12-22 c9fb4eb0a2 cmd/link: handle grouped resource sections
* 2020-12-22 c06a354bcc test: trigger SIGSEGV instead of SIGTRAP in issue11656.go
* 2020-12-22 0aa9b4709a cmd/pack: r command create output file if not exist
* 2020-12-22 4d27c4c223 runtime: correct error handling in several FreeBSD syscall wrappers
* 2020-12-22 9b6147120a cmd/pack: treat compiler's -linkobj output as "compiler object"
* 2020-12-21 bc7e4d9257 syscall: don't generate ptrace on iOS
* 2020-12-21 6cff874c47 runtime/metrics: add Read examples
* 2020-12-21 8438a5779b runtime: use _exit on darwin
* 2020-12-21 cb95819cf6 runtime: detect netbsd netpoll overrun in sysmon
* 2020-12-21 53c984d976 runtime: skip wakep call in wakeNetPoller on Plan 9
* 2020-12-21 9abbe27710 test: skip issue11656.go on mips/mips64/ppc64
Change-Id: Ibb235fbf6a86ebcf50c686dc11f7c02d1865f845
Diffstat (limited to 'src/syscall/syscall_darwin_arm64.go')
| -rw-r--r-- | src/syscall/syscall_darwin_arm64.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/syscall/syscall_darwin_arm64.go b/src/syscall/syscall_darwin_arm64.go index d267a4ae6e..ab57117475 100644 --- a/src/syscall/syscall_darwin_arm64.go +++ b/src/syscall/syscall_darwin_arm64.go @@ -21,7 +21,7 @@ func setTimeval(sec, usec int64) Timeval { //sys Stat(path string, stat *Stat_t) (err error) //sys Statfs(path string, stat *Statfs_t) (err error) //sys fstatat(fd int, path string, stat *Stat_t, flags int) (err error) -//sys ptrace(request int, pid int, addr uintptr, data uintptr) (err error) +//sys ptrace1(request int, pid int, addr uintptr, data uintptr) (err error) = SYS_ptrace func SetKevent(k *Kevent_t, fd, mode, flags int) { k.Ident = uint64(fd) |