diff options
| author | Aram Hăvărneanu <aram@mgk.ro> | 2015-03-30 13:52:07 +0200 |
|---|---|---|
| committer | Aram Hăvărneanu <aram@mgk.ro> | 2015-05-06 11:36:57 +0000 |
| commit | c94f1f791b513c232b2293b8acebe9a2fd962003 (patch) | |
| tree | fcc03d6b9df53b104ae6fc1ebee20dd68e0225b7 /src/runtime/netpoll_solaris.go | |
| parent | e481aac0e1f7c26ce5c86c5771bcd4ca81e90765 (diff) | |
| download | go-c94f1f791b513c232b2293b8acebe9a2fd962003.tar.gz go-c94f1f791b513c232b2293b8acebe9a2fd962003.zip | |
runtime: always load address of libcFunc on Solaris
The linker always uses .plt for externals, so libcFunc is now an actual
external symbol instead of a pointer to one.
Fixes most of the breakage introduced in previous CL.
Change-Id: I64b8c96f93127f2d13b5289b024677fd3ea7dbea
Reviewed-on: https://go-review.googlesource.com/8215
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Minux Ma <minux@golang.org>
Diffstat (limited to 'src/runtime/netpoll_solaris.go')
| -rw-r--r-- | src/runtime/netpoll_solaris.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/runtime/netpoll_solaris.go b/src/runtime/netpoll_solaris.go index abfe56d801..359fd47b2a 100644 --- a/src/runtime/netpoll_solaris.go +++ b/src/runtime/netpoll_solaris.go @@ -89,23 +89,23 @@ func errno() int32 { } func fcntl(fd, cmd int32, arg uintptr) int32 { - return int32(sysvicall3(libc_fcntl, uintptr(fd), uintptr(cmd), arg)) + return int32(sysvicall3(&libc_fcntl, uintptr(fd), uintptr(cmd), arg)) } func port_create() int32 { - return int32(sysvicall0(libc_port_create)) + return int32(sysvicall0(&libc_port_create)) } func port_associate(port, source int32, object uintptr, events uint32, user uintptr) int32 { - return int32(sysvicall5(libc_port_associate, uintptr(port), uintptr(source), object, uintptr(events), user)) + return int32(sysvicall5(&libc_port_associate, uintptr(port), uintptr(source), object, uintptr(events), user)) } func port_dissociate(port, source int32, object uintptr) int32 { - return int32(sysvicall3(libc_port_dissociate, uintptr(port), uintptr(source), object)) + return int32(sysvicall3(&libc_port_dissociate, uintptr(port), uintptr(source), object)) } func port_getn(port int32, evs *portevent, max uint32, nget *uint32, timeout *timespec) int32 { - return int32(sysvicall5(libc_port_getn, uintptr(port), uintptr(unsafe.Pointer(evs)), uintptr(max), uintptr(unsafe.Pointer(nget)), uintptr(unsafe.Pointer(timeout)))) + return int32(sysvicall5(&libc_port_getn, uintptr(port), uintptr(unsafe.Pointer(evs)), uintptr(max), uintptr(unsafe.Pointer(nget)), uintptr(unsafe.Pointer(timeout)))) } var portfd int32 = -1 |