diff options
| author | Russ Cox <rsc@golang.org> | 2014-09-09 14:02:37 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-09-09 14:02:37 -0400 |
| commit | 8ac35be145c407896a3c799dddb155c2a22c88ef (patch) | |
| tree | 2471fa085f51c1104fd04aeebc01f2c96540b9ea /src/runtime/sys_windows_amd64.s | |
| parent | 15b76ad94b1054ec7fd6853530bff782790b5727 (diff) | |
| download | go-8ac35be145c407896a3c799dddb155c2a22c88ef.tar.xz | |
runtime: fix build failures after CL 137410043
No promise about correctness, but they do build.
TBR=khr
CC=golang-codereviews
https://golang.org/cl/143720043
Diffstat (limited to 'src/runtime/sys_windows_amd64.s')
| -rw-r--r-- | src/runtime/sys_windows_amd64.s | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/runtime/sys_windows_amd64.s b/src/runtime/sys_windows_amd64.s index 3d63a04de9..f701d157ed 100644 --- a/src/runtime/sys_windows_amd64.s +++ b/src/runtime/sys_windows_amd64.s @@ -229,8 +229,11 @@ TEXT runtime·externalthreadhandler(SB),NOSPLIT,$0 MOVQ BX, g_m(SP) LEAQ -8192(SP), CX - MOVQ CX, g_stackguard(SP) - MOVQ DX, g_stackbase(SP) + MOVQ CX, (g_stack+stack_lo)(SP) + ADDQ $const_StackGuard, CX + MOVQ CX, g_stackguard0(SP) + MOVQ CX, g_stackguard1(SP) + MOVQ DX, (g_stack+stack_hi)(SP) PUSHQ 32(BP) // arg for handler CALL 16(BP) @@ -238,7 +241,7 @@ TEXT runtime·externalthreadhandler(SB),NOSPLIT,$0 get_tls(CX) MOVQ g(CX), CX - MOVQ g_stackbase(CX), SP + MOVQ (g_stack+stack_hi)(CX), SP POPQ 0x28(GS) POPQ DI POPQ SI @@ -334,9 +337,12 @@ TEXT runtime·tstart_stdcall(SB),NOSPLIT,$0 // Layout new m scheduler stack on os stack. MOVQ SP, AX - MOVQ AX, g_stackbase(DX) + MOVQ AX, (g_stack+stack_hi)(DX) SUBQ $(64*1024), AX // stack size - MOVQ AX, g_stackguard(DX) + MOVQ AX, (g_stack+stack_lo)(DX) + ADDQ $const_StackGuard, AX + MOVQ AX, g_stackguard0(DX) + MOVQ AX, g_stackguard1(DX) // Set up tls. LEAQ m_tls(CX), SI |