From e10f822d58a04b7826965b45df0e166c460f499c Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 21 Sep 2020 15:04:15 +0200 Subject: [PATCH] unix: import accept4 from libsocket.so on illumos The accept4 symbol is provided in libsocket.so on illumos. Follow-up fix for CL 254717. Change-Id: Iad70e998ea4ab80763288a300797eae8bed7de1a Reviewed-on: https://go-review.googlesource.com/c/sys/+/256277 Trust: Tobias Klauser Run-TryBot: Tobias Klauser TryBot-Result: Go Bot Reviewed-by: Ian Lance Taylor --- unix/syscall_illumos.go | 2 +- unix/zsyscall_illumos_amd64.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/unix/syscall_illumos.go b/unix/syscall_illumos.go index 16e40091..bbc4f3ea 100644 --- a/unix/syscall_illumos.go +++ b/unix/syscall_illumos.go @@ -56,7 +56,7 @@ func Pwritev(fd int, iovs [][]byte, off int64) (n int, err error) { return n, err } -//sys accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) +//sys accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) = libsocket.accept4 func Accept4(fd int, flags int) (nfd int, sa Sockaddr, err error) { var rsa RawSockaddrAny diff --git a/unix/zsyscall_illumos_amd64.go b/unix/zsyscall_illumos_amd64.go index 8b329c45..d3af083f 100644 --- a/unix/zsyscall_illumos_amd64.go +++ b/unix/zsyscall_illumos_amd64.go @@ -13,7 +13,7 @@ import ( //go:cgo_import_dynamic libc_preadv preadv "libc.so" //go:cgo_import_dynamic libc_writev writev "libc.so" //go:cgo_import_dynamic libc_pwritev pwritev "libc.so" -//go:cgo_import_dynamic libc_accept4 accept4 "libc.so" +//go:cgo_import_dynamic libc_accept4 accept4 "libsocket.so" //go:cgo_import_dynamic libc_pipe2 pipe2 "libc.so" //go:linkname procreadv libc_readv