diff options
| author | Wei Guangjing <vcc.163@gmail.com> | 2011-07-19 10:47:33 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2011-07-19 10:47:33 -0400 |
| commit | 9f636598ba2425cbc31e416599f430829fa36b20 (patch) | |
| tree | 19bc60df7034f0e6cddfc7566be8297d6095e3a2 /src/pkg/runtime/amd64 | |
| parent | 0b200b4d0902459551812dd18642332e494c7d12 (diff) | |
| download | go-9f636598ba2425cbc31e416599f430829fa36b20.tar.xz | |
cgo: windows amd64 port
R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/4725041
Diffstat (limited to 'src/pkg/runtime/amd64')
| -rw-r--r-- | src/pkg/runtime/amd64/asm.s | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/pkg/runtime/amd64/asm.s b/src/pkg/runtime/amd64/asm.s index 2734ae1dca..2b16587f8c 100644 --- a/src/pkg/runtime/amd64/asm.s +++ b/src/pkg/runtime/amd64/asm.s @@ -18,7 +18,8 @@ TEXT _rt0_amd64(SB),7,$-8 TESTQ AX, AX JZ needtls CALL AX - JMP ok + CMPL runtime·iswindows(SB), $0 + JEQ ok needtls: LEAQ runtime·tls0(SB), DI @@ -432,6 +433,7 @@ TEXT runtime·asmcgocall(SB),7,$0 MOVQ DI, 16(SP) // save g MOVQ DX, 8(SP) // save SP MOVQ BX, DI // DI = first argument in AMD64 ABI + MOVQ BX, CX // CX = first argument in Win64 CALL AX // Restore registers, g, stack pointer. |