diff options
author | Ian Lance Taylor <iant@golang.org> | 2016-09-21 14:21:11 -0700 |
---|---|---|
committer | Ian Lance Taylor <iant@golang.org> | 2016-09-21 23:04:34 +0000 |
commit | 9e028b70ea3c1a81220a63c2ed3a2c1cd216c733 (patch) | |
tree | 9cd9e14aed51c653521ff2c6dad1d95a6b27132f /src/runtime/sys_solaris_amd64.s | |
parent | 5db80c30e6b360ef18159332b3ff19234f911f36 (diff) | |
download | go-9e028b70ea3c1a81220a63c2ed3a2c1cd216c733.tar.gz go-9e028b70ea3c1a81220a63c2ed3a2c1cd216c733.zip |
runtime: merge signal[12]_unix.go into signal_unix.go
Requires adding a sigfwd function for Solaris, as previously
signal2_unix.go was not built for Solaris.
Change-Id: Iea3ff0ddfa15af573813eb075bead532b324a3fc
Reviewed-on: https://go-review.googlesource.com/29550
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/runtime/sys_solaris_amd64.s')
-rw-r--r-- | src/runtime/sys_solaris_amd64.s | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/runtime/sys_solaris_amd64.s b/src/runtime/sys_solaris_amd64.s index 07a7acef11..a36bd37ff0 100644 --- a/src/runtime/sys_solaris_amd64.s +++ b/src/runtime/sys_solaris_amd64.s @@ -289,6 +289,14 @@ exit: ADDQ $184, SP RET +TEXT runtime·sigfwd(SB),NOSPLIT,$0-32 + MOVL sig+8(FP), DI + MOVQ info+16(FP), SI + MOVQ ctx+24(FP), DX + MOVQ fn+0(FP), AX + CALL AX + RET + // Called from runtime·usleep (Go). Can be called on Go stack, on OS stack, // can also be called in cgo callback path without a g->m. TEXT runtime·usleep1(SB),NOSPLIT,$0 |