From 2560f8fe223a35aa5a6b203a3bfd922cb4bd819e Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 14 Aug 2013 14:54:08 -0400 Subject: [PATCH] runtime/cgo: use old-style indirect call on arm TBR=elias.naur CC=golang-dev https://golang.org/cl/12943043 --- src/pkg/runtime/cgo/gcc_arm.S | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pkg/runtime/cgo/gcc_arm.S b/src/pkg/runtime/cgo/gcc_arm.S index 7cf91f9ffa..be50408825 100644 --- 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) -- 2.48.1