From: Russ Cox <rsc@golang.org>
Date: Fri, 1 Mar 2013 05:30:19 +0000 (-0500)
Subject: runtime/cgo: fix arm build
X-Git-Tag: go1.1rc2~752
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=83c5d07c0e940b0ff3f9da23920f047c4dd6e6fe;p=gostls13.git

runtime/cgo: fix arm build

During my global search and replace I forgot to open *.S (capital).

R=golang-dev
TBR=golang-dev
CC=golang-dev
https://golang.org/cl/7415047
---

diff --git a/src/pkg/runtime/cgo/gcc_arm.S b/src/pkg/runtime/cgo/gcc_arm.S
index fc6d34cae9..d788d42488 100644
--- a/src/pkg/runtime/cgo/gcc_arm.S
+++ b/src/pkg/runtime/cgo/gcc_arm.S
@@ -24,7 +24,7 @@ EXT(crosscall_arm2):
 	mov r10, r1 // g
 	mov r9, r2 // m
 	mov r3, r0 // save r0, cgo_tls_set_gm will clobber it
-	bl EXT(cgo_tls_set_gm) // save current g and m into TLS variable
+	bl EXT(x_cgo_save_gm) // save current g and m into TLS variable
 	mov lr, pc
 	mov pc, r3
 	pop {r4, r5, r6, r7, r8, r9, r10, r11, ip, pc}
@@ -45,7 +45,7 @@ EXT(crosscall2):
 	 *  nevertheless.
 	 */
 	push {r0, r1, r2, r4, r5, r6, r7, r8, r9, r10, r11, ip, lr}
-	bl EXT(cgo_tls_get_gm) // set up g and m from TLS
+	bl EXT(x_cgo_load_gm) // set up g and m from TLS
 	mov lr, pc
 	ldr pc, [sp, #0]
 	pop {r0, r1, r2, r4, r5, r6, r7, r8, r9, r10, r11, ip, pc}