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/asm_arm.s | |
| parent | 3b76b017cabb0ea29a184670e081edfe11afb8de (diff) | |
| download | go-ab0535ae3fb45ba734d47542cc4845f27f708d1b.tar.xz | |
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/asm_arm.s')
| -rw-r--r-- | src/runtime/asm_arm.s | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/runtime/asm_arm.s b/src/runtime/asm_arm.s index fdcc0e67c1..6fe931bd89 100644 --- a/src/runtime/asm_arm.s +++ b/src/runtime/asm_arm.s @@ -32,8 +32,7 @@ TEXT runtime·rt0_go(SB),NOSPLIT,$-4 // create istack out of the OS stack MOVW $(-8192+104)(R13), R0 - MOVW R0, g_stackguard0(g) - MOVW R0, g_stackguard1(g) + MOVW R0, g_stackguard(g) MOVW R0, (g_stack+stack_lo)(g) MOVW R13, (g_stack+stack_hi)(g) @@ -56,8 +55,7 @@ nocgo: // update stackguard after _cgo_init MOVW (g_stack+stack_lo)(g), R0 ADD $const__StackGuard, R0 - MOVW R0, g_stackguard0(g) - MOVW R0, g_stackguard1(g) + MOVW R0, g_stackguard(g) BL runtime·checkgoarm(SB) BL runtime·check(SB) |