diff options
| author | Russ Cox <rsc@golang.org> | 2014-12-05 11:43:41 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-12-05 11:43:41 -0500 |
| commit | 8670c52abcdb260f5366d6fa205a7c7f9b5b1067 (patch) | |
| tree | 3781a05c976360f88b736c71316dadc789e02062 /src/runtime/sys_darwin_386.s | |
| parent | 3ebebda3a7495402239db4369d59d73749c1bfa2 (diff) | |
| parent | 6d3ba1914e289ed223f7bb69f34604c0e2ae5384 (diff) | |
| download | go-8670c52abcdb260f5366d6fa205a7c7f9b5b1067.tar.gz | |
all: merge dev.cc (81884b89bd88) into default
With this change, default now contains Go 1.5 work.
Any future bug fixes for Go 1.4 in the compilers or
the runtime will have to be made directly to the
release branch.
Diffstat (limited to 'src/runtime/sys_darwin_386.s')
| -rw-r--r-- | src/runtime/sys_darwin_386.s | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/runtime/sys_darwin_386.s b/src/runtime/sys_darwin_386.s index a961c71a8..7cb5695e7 100644 --- a/src/runtime/sys_darwin_386.s +++ b/src/runtime/sys_darwin_386.s @@ -6,7 +6,8 @@ // See http://fxr.watson.org/fxr/source/bsd/kern/syscalls.c?v=xnu-1228 // or /usr/include/sys/syscall.h (on a Mac) for system call numbers. -#include "zasm_GOOS_GOARCH.h" +#include "go_asm.h" +#include "go_tls.h" #include "textflag.h" // Exit the entire program (like C exit) @@ -248,7 +249,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 +276,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 |