Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

runtime: always load address of libcFunc on Solaris

Browse source 
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>
This commit is contained in:
Aram Hăvărneanu 2015-03-30 13:52:07 +02:00
parent e481aac0e1
commit c94f1f791b
5 changed files with 80 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/runtime/syscall_solaris.go
View file

@ -60,7 +60,7 @@ func syscall_rawsysvicall6(fn, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, e
//go:nosplit
func syscall_chdir(path uintptr) (err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_chdir)),
fn: uintptr(unsafe.Pointer(&libc_chdir)),
n: 1,
args: uintptr(unsafe.Pointer(&path)),
}
@ -71,7 +71,7 @@ func syscall_chdir(path uintptr) (err uintptr) {
//go:nosplit
func syscall_chroot(path uintptr) (err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_chroot)),
fn: uintptr(unsafe.Pointer(&libc_chroot)),
n: 1,
args: uintptr(unsafe.Pointer(&path)),
}
@ -82,12 +82,12 @@ func syscall_chroot(path uintptr) (err uintptr) {
// like close, but must not split stack, for forkx.
//go:nosplit
func syscall_close(fd int32) int32 {
return int32(sysvicall1(libc_close, uintptr(fd)))
return int32(sysvicall1(&libc_close, uintptr(fd)))
}
func syscall_dlopen(name *byte, mode uintptr) (handle uintptr, err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_dlopen)),
fn: uintptr(unsafe.Pointer(&libc_dlopen)),
n: 2,
args: uintptr(unsafe.Pointer(&name)),
}
@ -102,7 +102,7 @@ func syscall_dlopen(name *byte, mode uintptr) (handle uintptr, err uintptr) {
func syscall_dlclose(handle uintptr) (err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_dlclose)),
fn: uintptr(unsafe.Pointer(&libc_dlclose)),
n: 1,
args: uintptr(unsafe.Pointer(&handle)),
}
@ -114,7 +114,7 @@ func syscall_dlclose(handle uintptr) (err uintptr) {
func syscall_dlsym(handle uintptr, name *byte) (proc uintptr, err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_dlsym)),
fn: uintptr(unsafe.Pointer(&libc_dlsym)),
n: 2,
args: uintptr(unsafe.Pointer(&handle)),
}
@ -130,7 +130,7 @@ func syscall_dlsym(handle uintptr, name *byte) (proc uintptr, err uintptr) {
//go:nosplit
func syscall_execve(path, argv, envp uintptr) (err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_execve)),
fn: uintptr(unsafe.Pointer(&libc_execve)),
n: 3,
args: uintptr(unsafe.Pointer(&path)),
}
@ -141,13 +141,13 @@ func syscall_execve(path, argv, envp uintptr) (err uintptr) {
// like exit, but must not split stack, for forkx.
//go:nosplit
func syscall_exit(code uintptr) {
sysvicall1(libc_exit, code)
sysvicall1(&libc_exit, code)
}
//go:nosplit
func syscall_fcntl(fd, cmd, arg uintptr) (val, err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_fcntl)),
fn: uintptr(unsafe.Pointer(&libc_fcntl)),
n: 3,
args: uintptr(unsafe.Pointer(&fd)),
}
@ -158,7 +158,7 @@ func syscall_fcntl(fd, cmd, arg uintptr) (val, err uintptr) {
//go:nosplit
func syscall_forkx(flags uintptr) (pid uintptr, err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_forkx)),
fn: uintptr(unsafe.Pointer(&libc_forkx)),
n: 1,
args: uintptr(unsafe.Pointer(&flags)),
}
@ -170,7 +170,7 @@ func syscall_gethostname() (name string, err uintptr) {
cname := new([_MAXHOSTNAMELEN]byte)
var args = [2]uintptr{uintptr(unsafe.Pointer(&cname[0])), _MAXHOSTNAMELEN}
call := libcall{
fn: uintptr(unsafe.Pointer(libc_gethostname)),
fn: uintptr(unsafe.Pointer(&libc_gethostname)),
n: 2,
args: uintptr(unsafe.Pointer(&args[0])),
}
@ -187,9 +187,9 @@ func syscall_gethostname() (name string, err uintptr) {
//go:nosplit
func syscall_getpid() (pid, err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_getpid)),
fn: uintptr(unsafe.Pointer(&libc_getpid)),
n: 0,
args: uintptr(unsafe.Pointer(libc_getpid)), // it's unused but must be non-nil, otherwise crashes
args: uintptr(unsafe.Pointer(&libc_getpid)), // it's unused but must be non-nil, otherwise crashes
}
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
return call.r1, call.err
@ -198,7 +198,7 @@ func syscall_getpid() (pid, err uintptr) {
//go:nosplit
func syscall_ioctl(fd, req, arg uintptr) (err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_ioctl)),
fn: uintptr(unsafe.Pointer(&libc_ioctl)),
n: 3,
args: uintptr(unsafe.Pointer(&fd)),
}
@ -226,7 +226,7 @@ func syscall_pipe() (r, w, err uintptr) {
// TODO(aram): make this panic once we stop calling fcntl(2) in net using it.
func syscall_rawsyscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_syscall)),
fn: uintptr(unsafe.Pointer(&libc_syscall)),
n: 4,
args: uintptr(unsafe.Pointer(&trap)),
}
@ -237,7 +237,7 @@ func syscall_rawsyscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr) {
//go:nosplit
func syscall_setgid(gid uintptr) (err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_setgid)),
fn: uintptr(unsafe.Pointer(&libc_setgid)),
n: 1,
args: uintptr(unsafe.Pointer(&gid)),
}
@ -248,7 +248,7 @@ func syscall_setgid(gid uintptr) (err uintptr) {
//go:nosplit
func syscall_setgroups(ngid, gid uintptr) (err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_setgroups)),
fn: uintptr(unsafe.Pointer(&libc_setgroups)),
n: 2,
args: uintptr(unsafe.Pointer(&ngid)),
}
@ -259,9 +259,9 @@ func syscall_setgroups(ngid, gid uintptr) (err uintptr) {
//go:nosplit
func syscall_setsid() (pid, err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_setsid)),
fn: uintptr(unsafe.Pointer(&libc_setsid)),
n: 0,
args: uintptr(unsafe.Pointer(libc_setsid)), // it's unused but must be non-nil, otherwise crashes
args: uintptr(unsafe.Pointer(&libc_setsid)), // it's unused but must be non-nil, otherwise crashes
}
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
return call.r1, call.err
@ -270,7 +270,7 @@ func syscall_setsid() (pid, err uintptr) {
//go:nosplit
func syscall_setuid(uid uintptr) (err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_setuid)),
fn: uintptr(unsafe.Pointer(&libc_setuid)),
n: 1,
args: uintptr(unsafe.Pointer(&uid)),
}
@ -281,7 +281,7 @@ func syscall_setuid(uid uintptr) (err uintptr) {
//go:nosplit
func syscall_setpgid(pid, pgid uintptr) (err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_setpgid)),
fn: uintptr(unsafe.Pointer(&libc_setpgid)),
n: 2,
args: uintptr(unsafe.Pointer(&pid)),
}
@ -297,7 +297,7 @@ func syscall_setpgid(pid, pgid uintptr) (err uintptr) {
// TODO(aram): make this panic once we stop calling fcntl(2) in net using it.
func syscall_syscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_syscall)),
fn: uintptr(unsafe.Pointer(&libc_syscall)),
n: 4,
args: uintptr(unsafe.Pointer(&trap)),
}
@ -309,7 +309,7 @@ func syscall_syscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr) {
func syscall_wait4(pid uintptr, wstatus *uint32, options uintptr, rusage unsafe.Pointer) (wpid int, err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_wait4)),
fn: uintptr(unsafe.Pointer(&libc_wait4)),
n: 4,
args: uintptr(unsafe.Pointer(&pid)),
}
@ -322,7 +322,7 @@ func syscall_wait4(pid uintptr, wstatus *uint32, options uintptr, rusage unsafe.
//go:nosplit
func syscall_write(fd, buf, nbyte uintptr) (n, err uintptr) {
call := libcall{
fn: uintptr(unsafe.Pointer(libc_write)),
fn: uintptr(unsafe.Pointer(&libc_write)),
n: 3,
args: uintptr(unsafe.Pointer(&fd)),
}