diff options
| author | Russ Cox <rsc@golang.org> | 2019-05-08 14:56:48 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2019-05-09 21:13:23 +0000 |
| commit | 60f67631a6c9e75ffd2829fcca56ac45d9baf019 (patch) | |
| tree | 498f0af006cd6f0d881890c9c3e726c201526254 /src/runtime/os3_solaris.go | |
| parent | 49f62af790c02c389d34a24227a17ddd4b4db94a (diff) | |
| download | go-60f67631a6c9e75ffd2829fcca56ac45d9baf019.tar.gz go-60f67631a6c9e75ffd2829fcca56ac45d9baf019.zip | |
runtime: fix vet complaints for solaris/amd64, illumos/amd64
Working toward making the tree vet-safe instead of having
so many exceptions in cmd/vet/all/whitelist.
This CL makes "go vet -unsafeptr=false runtime" happy for these GOOS/GOARCHes,
while keeping "GO_BUILDER_NAME=misc-vetall go tool dist test" happy too.
For #31916.
Change-Id: Ic64f7f4034695dd4c32c9b7f258960faf3742a83
Reviewed-on: https://go-review.googlesource.com/c/go/+/176103
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/runtime/os3_solaris.go')
| -rw-r--r-- | src/runtime/os3_solaris.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/runtime/os3_solaris.go b/src/runtime/os3_solaris.go index b5f8a7c042..b5a11e8f51 100644 --- a/src/runtime/os3_solaris.go +++ b/src/runtime/os3_solaris.go @@ -294,7 +294,7 @@ func semacreate(mp *m) { _g_.m.scratch = mscratch{} _g_.m.scratch.v[0] = unsafe.Sizeof(*sem) _g_.m.libcall.args = uintptr(unsafe.Pointer(&_g_.m.scratch)) - asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&_g_.m.libcall)) + asmcgocall(unsafe.Pointer(&asmsysvicall6x), unsafe.Pointer(&_g_.m.libcall)) sem = (*semt)(unsafe.Pointer(_g_.m.libcall.r1)) if sem_init(sem, 0, 0) != 0 { throw("sem_init") @@ -315,7 +315,7 @@ func semasleep(ns int64) int32 { _m_.scratch.v[0] = _m_.waitsema _m_.scratch.v[1] = uintptr(unsafe.Pointer(&_m_.ts)) _m_.libcall.args = uintptr(unsafe.Pointer(&_m_.scratch)) - asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&_m_.libcall)) + asmcgocall(unsafe.Pointer(&asmsysvicall6x), unsafe.Pointer(&_m_.libcall)) if *_m_.perrno != 0 { if *_m_.perrno == _ETIMEDOUT || *_m_.perrno == _EAGAIN || *_m_.perrno == _EINTR { return -1 @@ -330,7 +330,7 @@ func semasleep(ns int64) int32 { _m_.scratch = mscratch{} _m_.scratch.v[0] = _m_.waitsema _m_.libcall.args = uintptr(unsafe.Pointer(&_m_.scratch)) - asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&_m_.libcall)) + asmcgocall(unsafe.Pointer(&asmsysvicall6x), unsafe.Pointer(&_m_.libcall)) if _m_.libcall.r1 == 0 { break } @@ -384,7 +384,7 @@ func doMmap(addr, n, prot, flags, fd, off uintptr) (uintptr, uintptr) { libcall.fn = uintptr(unsafe.Pointer(&libc_mmap)) libcall.n = 6 libcall.args = uintptr(noescape(unsafe.Pointer(&addr))) - asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&libcall)) + asmcgocall(unsafe.Pointer(&asmsysvicall6x), unsafe.Pointer(&libcall)) return libcall.r1, libcall.err } |