diff options
| author | Michael Pratt <mpratt@google.com> | 2022-04-21 14:49:54 -0400 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2022-04-21 19:06:50 +0000 |
| commit | d35ec0b899fe1013af49adb92ef789e25797c2eb (patch) | |
| tree | 98f959d0b3c51f7c5648691531d8ec213e62293a /src/syscall/syscall_linux.go | |
| parent | 347534343b114d9183efeefcb1d49458e1e8e34f (diff) | |
| download | go-git-d35ec0b899fe1013af49adb92ef789e25797c2eb.tar.gz | |
Revert "syscall: define Syscall6 in terms of RawSyscall6 on linux"
This reverts CL 388478. Parent CL 388477 breaks cmd/go
TestScript/cover_pkgall_runtime.
For #51087.
For #52472.
Change-Id: Id5d5a4e138792cf130ecdcc6b996c8102d142a7e
Reviewed-on: https://go-review.googlesource.com/c/go/+/401635
Run-TryBot: Michael Pratt <mpratt@google.com>
Auto-Submit: Michael Pratt <mpratt@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Diffstat (limited to 'src/syscall/syscall_linux.go')
| -rw-r--r-- | src/syscall/syscall_linux.go | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/syscall/syscall_linux.go b/src/syscall/syscall_linux.go index a796d17066..57e4769731 100644 --- a/src/syscall/syscall_linux.go +++ b/src/syscall/syscall_linux.go @@ -16,6 +16,8 @@ import ( "unsafe" ) +func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno) + // N.B. RawSyscall6 is provided via linkname by runtime/internal/syscall. // // Errno is uintptr and thus compatible with the runtime/internal/syscall @@ -66,16 +68,6 @@ func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno) { return } -//go:uintptrkeepalive -//go:nosplit -//go:linkname Syscall6 -func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno) { - runtime_entersyscall() - r1, r2, err = RawSyscall6(trap, a1, a2, a3, a4, a5, a6) - runtime_exitsyscall() - return -} - func rawSyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr) /* |