diff options
| author | Russ Cox <rsc@golang.org> | 2014-10-29 12:25:24 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-10-29 12:25:24 -0400 |
| commit | 710efc5a3085f55968c120abb25206fb72c05d46 (patch) | |
| tree | 433262b4bdac6643d923971ea21bb39cb69822a7 /src/runtime/sys_darwin_386.s | |
| parent | 40520a21d8b050635a417666db959f75d757fff5 (diff) | |
| parent | cc517ca5f7183e7f5d91bf75897b23cc0f4ed04f (diff) | |
| download | go-710efc5a3085f55968c120abb25206fb72c05d46.tar.gz | |
[dev.garbage] all: merge dev.power64 (5ad5e85cfb99) into dev.garbage
The goal here is to get the big-endian fixes so that
in some upcoming code movement for write barriers
I don't make them unmergeable.
LGTM=rlh
R=rlh
CC=golang-codereviews
https://codereview.appspot.com/166890043
Diffstat (limited to 'src/runtime/sys_darwin_386.s')
| -rw-r--r-- | src/runtime/sys_darwin_386.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/sys_darwin_386.s b/src/runtime/sys_darwin_386.s index a961c71a8..3bf8b1d41 100644 --- a/src/runtime/sys_darwin_386.s +++ b/src/runtime/sys_darwin_386.s @@ -248,7 +248,7 @@ TEXT runtime·sigtramp(SB),NOSPLIT,$40 MOVL BX, 0(SP) MOVL $runtime·badsignal(SB), AX CALL AX - JMP sigtramp_ret + JMP ret // save g MOVL DI, 20(SP) @@ -275,7 +275,7 @@ TEXT runtime·sigtramp(SB),NOSPLIT,$40 MOVL 20(SP), DI MOVL DI, g(CX) -sigtramp_ret: +ret: // call sigreturn MOVL context+16(FP), CX MOVL style+4(FP), BX |