From: Russ Cox <rsc@golang.org>
Date: Fri, 31 Jul 2015 02:52:45 +0000 (-0400)
Subject: runtime: fix systemstack tracebacks on nacl/arm
X-Git-Tag: go1.5rc1~65
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=108ec5f75a45f3e8f12698f5476b51723feda838;p=gostls13.git

runtime: fix systemstack tracebacks on nacl/arm

For #11956.

Change-Id: Ic9b57cafa197953cc7f435941e44d42b60b3ddf0
Reviewed-on: https://go-review.googlesource.com/13011
Reviewed-by: Dave Cheney <dave@cheney.net>
---

diff --git a/src/runtime/asm_arm.s b/src/runtime/asm_arm.s
index 01504700f1..91dccdc381 100644
--- a/src/runtime/asm_arm.s
+++ b/src/runtime/asm_arm.s
@@ -215,6 +215,9 @@ switch:
 	// save our state in g->sched.  Pretend to
 	// be systemstack_switch if the G stack is scanned.
 	MOVW	$runtime·systemstack_switch(SB), R3
+#ifdef GOOS_nacl
+	ADD	$4, R3, R3 // get past nacl-insert bic instruction
+#endif
 	ADD	$4, R3, R3 // get past push {lr}
 	MOVW	R3, (g_sched+gobuf_pc)(g)
 	MOVW	R13, (g_sched+gobuf_sp)(g)