diff options
author | Shenghou Ma <minux@golang.org> | 2014-12-29 01:08:40 -0500 |
---|---|---|
committer | Keith Randall <khr@golang.org> | 2014-12-29 07:36:07 +0000 |
commit | ab0535ae3fb45ba734d47542cc4845f27f708d1b (patch) | |
tree | 0357ccba7c596a90470785ebd189416d15b6d74e /src/runtime/sys_windows_386.s | |
parent | 3b76b017cabb0ea29a184670e081edfe11afb8de (diff) | |
download | go-ab0535ae3fb45ba734d47542cc4845f27f708d1b.tar.gz go-ab0535ae3fb45ba734d47542cc4845f27f708d1b.zip |
liblink, cmd/ld, runtime: remove stackguard1
Now that we've removed all the C code in runtime and the C compilers,
there is no need to have a separate stackguard field to check for C
code on Go stack.
Remove field g.stackguard1 and rename g.stackguard0 to g.stackguard.
Adjust liblink and cmd/ld as necessary.
Change-Id: I54e75db5a93d783e86af5ff1a6cd497d669d8d33
Reviewed-on: https://go-review.googlesource.com/2144
Reviewed-by: Keith Randall <khr@golang.org>
Diffstat (limited to 'src/runtime/sys_windows_386.s')
-rw-r--r-- | src/runtime/sys_windows_386.s | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/runtime/sys_windows_386.s b/src/runtime/sys_windows_386.s index c8a830cdf8..eee65736e9 100644 --- a/src/runtime/sys_windows_386.s +++ b/src/runtime/sys_windows_386.s @@ -209,8 +209,7 @@ TEXT runtime·externalthreadhandler(SB),NOSPLIT,$0 LEAL -8192(SP), CX MOVL CX, (g_stack+stack_lo)(SP) ADDL $const__StackGuard, CX - MOVL CX, g_stackguard0(SP) - MOVL CX, g_stackguard1(SP) + MOVL CX, g_stackguard(SP) MOVL DX, (g_stack+stack_hi)(SP) PUSHL 16(BP) // arg for handler @@ -315,8 +314,7 @@ 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_stackguard0(DX) - MOVL AX, g_stackguard1(DX) + MOVL AX, g_stackguard(DX) // Set up tls. LEAL m_tls(CX), SI |