From fadd371f5df44d1f6caa6aaae0b46ab5b7e1f3c7 Mon Sep 17 00:00:00 2001
From: Keith Randall <khr@golang.org>
Date: Thu, 25 Sep 2014 08:37:04 -0700
Subject: runtime: add load_g call in arm callback.

Need to restore the g register.  Somehow this line vaporized from
CL 144130043.  Also cgo_topofstack -> _cgo_topofstack, that vaporized also.

TBR=rsc
CC=golang-codereviews
https://codereview.appspot.com/150940044
---
 src/runtime/asm_arm.s | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/runtime/asm_arm.s')

diff --git a/src/runtime/asm_arm.s b/src/runtime/asm_arm.s
index 2c5de8afb..06bd0751d 100644
--- a/src/runtime/asm_arm.s
+++ b/src/runtime/asm_arm.s
@@ -1303,7 +1303,8 @@ yieldloop:
 
 // Called from cgo wrappers, this function returns g->m->curg.stack.hi.
 // Must obey the gcc calling convention.
-TEXT cgo_topofstack(SB),NOSPLIT,$0
+TEXT _cgo_topofstack(SB),NOSPLIT,$0
+	BL	runtime·load_g(SB)
 	MOVW	g_m(g), R0
 	MOVW	m_curg(R0), R0
 	MOVW	(g_stack+stack_hi)(R0), R0
-- 
cgit v1.2.1