diff options
author | Russ Cox <rsc@golang.org> | 2015-01-05 16:29:21 +0000 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2015-01-05 16:29:56 +0000 |
commit | e6d351126475dd55d9f2094c22a11c63919ab106 (patch) | |
tree | 58b2d9019e1b0db4331516e91e2d1b17b00d0d2c /src/runtime/sys_windows_386.s | |
parent | a1c9e103719289b4f291fcb631ad324a0e331aed (diff) | |
download | go-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_windows_386.s')
-rw-r--r-- | src/runtime/sys_windows_386.s | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/runtime/sys_windows_386.s b/src/runtime/sys_windows_386.s index eee65736e9..c8a830cdf8 100644 --- a/src/runtime/sys_windows_386.s +++ b/src/runtime/sys_windows_386.s @@ -209,7 +209,8 @@ TEXT runtime·externalthreadhandler(SB),NOSPLIT,$0 LEAL -8192(SP), CX MOVL CX, (g_stack+stack_lo)(SP) ADDL $const__StackGuard, CX - MOVL CX, g_stackguard(SP) + MOVL CX, g_stackguard0(SP) + MOVL CX, g_stackguard1(SP) MOVL DX, (g_stack+stack_hi)(SP) PUSHL 16(BP) // arg for handler @@ -314,7 +315,8 @@ TEXT runtime·tstart(SB),NOSPLIT,$0 SUBL $(64*1024), AX // stack size MOVL AX, (g_stack+stack_lo)(DX) ADDL $const__StackGuard, AX - MOVL AX, g_stackguard(DX) + MOVL AX, g_stackguard0(DX) + MOVL AX, g_stackguard1(DX) // Set up tls. LEAL m_tls(CX), SI |