From 3f266cf49e552423a82b52b800a55a5374f837ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 12 May 2020 15:50:10 +0300 Subject: [PATCH] checkasm: arm: Don't use blx to call checkasm_fail_func MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We should just use a normal bl here, and the linker will add the 'x' bit if necessary. This fixes calling the checkasm_fail_func on windows, where the code is built in thumb mode (and the linker doesn't clear the 'x' bit in the blx instruction). Signed-off-by: Martin Storsjö --- tests/checkasm/arm/checkasm.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/checkasm/arm/checkasm.S b/tests/checkasm/arm/checkasm.S index 838c383671..a5ba238684 100644 --- a/tests/checkasm/arm/checkasm.S +++ b/tests/checkasm/arm/checkasm.S @@ -150,7 +150,7 @@ function checkasm_checked_call_\variant, export=1 2: movrel r0, error_message_gpr 1: - blx X(checkasm_fail_func) + bl X(checkasm_fail_func) 0: pop {r0, r1} .ifc \variant, vfp