aboutsummaryrefslogtreecommitdiff
path: root/src/runtime/sys_solaris_amd64.s
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2015-01-05 16:29:21 +0000
committerRuss Cox <rsc@golang.org>2015-01-05 16:29:56 +0000
commite6d351126475dd55d9f2094c22a11c63919ab106 (patch)
tree58b2d9019e1b0db4331516e91e2d1b17b00d0d2c /src/runtime/sys_solaris_amd64.s
parenta1c9e103719289b4f291fcb631ad324a0e331aed (diff)
downloadgo-e6d351126475dd55d9f2094c22a11c63919ab106.tar.gz
go-e6d351126475dd55d9f2094c22a11c63919ab106.zip
Revert "liblink, cmd/ld, runtime: remove stackguard1"
This reverts commit ab0535ae3fb45ba734d47542cc4845f27f708d1b. I think it will remain useful to distinguish code that must run on a system stack from code that can run on either stack, even if that distinction is no longer based on the implementation language. That is, I expect to add a //go:systemstack comment that, in terms of the old implementation, tells the compiler, to pretend this function was written in C. Change-Id: I33d2ebb2f99ae12496484c6ec8ed07233d693275 Reviewed-on: https://go-review.googlesource.com/2275 Reviewed-by: Russ Cox <rsc@golang.org>
Diffstat (limited to 'src/runtime/sys_solaris_amd64.s')
-rw-r--r--src/runtime/sys_solaris_amd64.s3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/runtime/sys_solaris_amd64.s b/src/runtime/sys_solaris_amd64.s
index 64a5224e98..54aeaeaf54 100644
--- a/src/runtime/sys_solaris_amd64.s
+++ b/src/runtime/sys_solaris_amd64.s
@@ -134,7 +134,8 @@ TEXT runtime·tstart_sysvicall(SB),NOSPLIT,$0
SUBQ $(0x100000), AX // stack size
MOVQ AX, (g_stack+stack_lo)(DX)
ADDQ $const__StackGuard, AX
- MOVQ AX, g_stackguard(DX)
+ MOVQ AX, g_stackguard0(DX)
+ MOVQ AX, g_stackguard1(DX)
// Someday the convention will be D is always cleared.
CLD