[FFmpeg-devel] [PATCH 3/5] checkasm: arm: Don't use blx to call checkasm_fail_func

Martin Storsjö martin at martin.st
Thu May 14 16:14:10 EEST 2020


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).
---
 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
-- 
2.17.1



More information about the ffmpeg-devel mailing list