diff options
| author | Michael Pratt <mpratt@google.com> | 2022-04-21 14:50:45 -0400 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2022-04-21 19:06:52 +0000 |
| commit | aac1d3a1b12a290805ca35ff268738fb334b1ca4 (patch) | |
| tree | 670678caaf65fe4517b26859a38975f6654e2ddc /src/syscall/syscall_linux.go | |
| parent | d35ec0b899fe1013af49adb92ef789e25797c2eb (diff) | |
| download | go-aac1d3a1b12a290805ca35ff268738fb334b1ca4.tar.xz | |
Revert "syscall: define Syscall in terms of RawSyscall on linux"
This reverts CL 388477, which breaks cmd/go
TestScript/cover_pkgall_runtime.
For #51087.
For #52472.
Change-Id: Id58af419a889281f15df2471c58fece011fcffbc
Reviewed-on: https://go-review.googlesource.com/c/go/+/401636
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 | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/syscall/syscall_linux.go b/src/syscall/syscall_linux.go index 57e4769731..a9a8ecbefd 100644 --- a/src/syscall/syscall_linux.go +++ b/src/syscall/syscall_linux.go @@ -16,6 +16,7 @@ import ( "unsafe" ) +func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno) 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. @@ -25,18 +26,6 @@ func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno) func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno) -// Pull in entersyscall/exitsyscall for Syscall/Syscall6. -// -// Note that this can't be a push linkname because the runtime already has a -// nameless linkname to export to assembly here and in x/sys. Additionally, -// entersyscall fetches the caller PC and SP and thus can't have a wrapper -// inbetween. - -//go:linkname runtime_entersyscall runtime.entersyscall -func runtime_entersyscall() -//go:linkname runtime_exitsyscall runtime.exitsyscall -func runtime_exitsyscall() - // N.B. For the Syscall functions below: // // //go:uintptrkeepalive because the uintptr argument may be converted pointers @@ -58,16 +47,6 @@ func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno) { return RawSyscall6(trap, a1, a2, a3, 0, 0, 0) } -//go:uintptrkeepalive -//go:nosplit -//go:linkname Syscall -func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno) { - runtime_entersyscall() - r1, r2, err = RawSyscall(trap, a1, a2, a3) - runtime_exitsyscall() - return -} - func rawSyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr) /* |