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/sys_solaris_amd64.s | |
| 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/sys_solaris_amd64.s')
| -rw-r--r-- | src/runtime/sys_solaris_amd64.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/runtime/sys_solaris_amd64.s b/src/runtime/sys_solaris_amd64.s index 54aeaeaf54..e4315645fe 100644 --- a/src/runtime/sys_solaris_amd64.s +++ b/src/runtime/sys_solaris_amd64.s @@ -41,7 +41,7 @@ TEXT runtime·nanotime1(SB),NOSPLIT,$0 SUBQ $64, SP // 16 bytes will do, but who knows in the future? MOVQ $3, DI // CLOCK_REALTIME from <sys/time_impl.h> MOVQ SP, SI - MOVQ libc_clock_gettime(SB), AX + LEAQ libc_clock_gettime(SB), AX CALL AX MOVQ (SP), AX // tv_sec from struct timespec IMULQ $1000000000, AX // multiply into nanoseconds @@ -54,7 +54,7 @@ TEXT runtime·nanotime1(SB),NOSPLIT,$0 TEXT runtime·pipe1(SB),NOSPLIT,$0 SUBQ $16, SP // 8 bytes will do, but stack has to be 16-byte alligned MOVQ SP, DI - MOVQ libc_pipe(SB), AX + LEAQ libc_pipe(SB), AX CALL AX MOVL 0(SP), AX MOVL 4(SP), DX @@ -321,13 +321,13 @@ noswitch: // Runs on OS stack. duration (in µs units) is in DI. TEXT runtime·usleep2(SB),NOSPLIT,$0 - MOVQ libc_usleep(SB), AX + LEAQ libc_usleep(SB), AX CALL AX RET // Runs on OS stack, called from runtime·osyield. TEXT runtime·osyield1(SB),NOSPLIT,$0 - MOVQ libc_sched_yield(SB), AX + LEAQ libc_sched_yield(SB), AX CALL AX RET |