]> Cypherpunks repositories - gostls13.git/commitdiff
internal/syscall/unix: use internal/abi.FuncPC for syscall wrapper
authorCherry Zhang <cherryyz@google.com>
Mon, 3 May 2021 22:17:38 +0000 (18:17 -0400)
committerCherry Zhang <cherryyz@google.com>
Mon, 3 May 2021 22:59:55 +0000 (22:59 +0000)
Following CL 313230, this is for internal/syscall/unix package.

Updates #45702.

Change-Id: Ie6d8c1923dfeae56896212393c5c2a6e257648d2
Reviewed-on: https://go-review.googlesource.com/c/go/+/316649
Trust: Cherry Zhang <cherryyz@google.com>
Run-TryBot: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Than McIntosh <thanm@google.com>
TryBot-Result: Go Bot <gobot@golang.org>

src/internal/syscall/unix/getentropy_darwin.go

index 6da6f84d9521401e8a2b6d1b899adda74f9ffe5e..e1a410a454144627108c7e449430b671b2689930 100644 (file)
@@ -5,6 +5,7 @@
 package unix
 
 import (
+       "internal/abi"
        "syscall"
        "unsafe"
 )
@@ -15,7 +16,7 @@ func libc_getentropy_trampoline()
 
 // GetEntropy calls the macOS getentropy system call.
 func GetEntropy(p []byte) error {
-       _, _, errno := syscall_syscall(funcPC(libc_getentropy_trampoline),
+       _, _, errno := syscall_syscall(abi.FuncPCABI0(libc_getentropy_trampoline),
                uintptr(unsafe.Pointer(&p[0])),
                uintptr(len(p)),
                0)
@@ -27,6 +28,3 @@ func GetEntropy(p []byte) error {
 
 //go:linkname syscall_syscall syscall.syscall
 func syscall_syscall(fn, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno)
-
-//go:linkname funcPC runtime.funcPC
-func funcPC(f interface{}) uintptr