runtime/cgo: use old-style indirect call on arm

TBR=elias.naur
CC=golang-dev
https://golang.org/cl/12943043

diff --git a/src/pkg/runtime/cgo/gcc_arm.S b/src/pkg/runtime/cgo/gcc_arm.S
index 7cf91f9ffa4dd23480ea47b56be51fb364596a1e..be504088253f33aa573191a45b701011b38be5a2 100644 (file)
--- a/src/pkg/runtime/cgo/gcc_arm.S
+++ b/src/pkg/runtime/cgo/gcc_arm.S
@@ -25,8 +25,12 @@ EXT(crosscall_arm2):
        mov r5, r1
        mov r0, r2
        mov r1, r3
-       bl r5 // setmg(m, g)
-       bl r4 // fn()
+       // setmg(m, g)
+       mov lr, pc
+       mov pc, r5
+       // fn()
+       mov lr, pc
+       mov pc, r4
        pop {r4, r5, r6, r7, r8, r9, r10, r11, ip, pc}
 
 .globl EXT(__stack_chk_fail_local)