From 9fe572e509470d53c220e7f43a825d70a7f0d8b3 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 29 Apr 2016 15:44:36 -0700 Subject: [PATCH] runtime: fix cgocallback_gofunc argument passing on arm64 Change-Id: I4b34bcd5cde71ecfbb352b39c4231de6168cc7f3 Reviewed-on: https://go-review.googlesource.com/22651 Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot Reviewed-by: Michael Munday --- src/runtime/asm_arm64.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/runtime/asm_arm64.s b/src/runtime/asm_arm64.s index 4a18db80c3..7ebd7bacb9 100644 --- a/src/runtime/asm_arm64.s +++ b/src/runtime/asm_arm64.s @@ -648,10 +648,10 @@ havem: BL runtime·save_g(SB) MOVD (g_sched+gobuf_sp)(g), R4 // prepare stack as R4 MOVD (g_sched+gobuf_pc)(g), R5 - MOVD R5, -(16+8)(R4) + MOVD R5, -(24+8)(R4) MOVD ctxt+24(FP), R0 - MOVD R0, -(24+8)(R4) // maintain 16-byte SP alignment - MOVD $-(24+8)(R4), R0 + MOVD R0, -(16+8)(R4) + MOVD $-(24+8)(R4), R0 // maintain 16-byte SP alignment MOVD R0, RSP BL runtime·cgocallbackg(SB) -- 2.48.1