Module: libav
Branch: master
Commit: 7bda4ed780c23c4bd50cf9ccd91f235e67ab0eae

Author:    Mans Rullgard <[email protected]>
Committer: Mans Rullgard <[email protected]>
Date:      Tue Oct  2 00:32:24 2012 +0100

ARM: fix Thumb PIC on Apple

LDR with register offset and PC as base register is not available in
the Thumb instruction set so the addition must be done separately.

Signed-off-by: Mans Rullgard <[email protected]>

---

 libavutil/arm/asm.S |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S
index ce7f46d..50305f7 100644
--- a/libavutil/arm/asm.S
+++ b/libavutil/arm/asm.S
@@ -141,7 +141,9 @@ ELF     .size   \name, . - \name
         ldr             \rd, .Lpicoff\@
 .Lpic\@:
     .if \indir
-        ldr             \rd, [pc, \rd]
+A       ldr             \rd, [pc, \rd]
+T       add             \rd, pc
+T       ldr             \rd, [\rd]
     .else
         add             \rd, pc
     .endif

_______________________________________________
libav-commits mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-commits

Reply via email to