[FFmpeg-cvslog] checkasm: arm: Don't use blx to call checkasm_fail_func

Martin Storsjö git at videolan.org
Fri May 15 21:33:21 EEST 2020

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Tue May 12 15:50:10 2020 +0300| [3f266cf49e552423a82b52b800a55a5374f837ec] | committer: Martin Storsjö

checkasm: arm: Don't use blx to call checkasm_fail_func

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ö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f266cf49e552423a82b52b800a55a5374f837ec

 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
         movrel          r0, error_message_gpr
-        blx             X(checkasm_fail_func)
+        bl              X(checkasm_fail_func)
         pop             {r0, r1}
 .ifc \variant, vfp

More information about the ffmpeg-cvslog mailing list