aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-10-02 00:32:24 +0100
committerMans Rullgard <mans@mansr.com>2012-10-02 13:12:33 +0100
commit7bda4ed780c23c4bd50cf9ccd91f235e67ab0eae (patch)
tree88fbda89aba2a40ce54ef013b1f47c3c16237c0b
parent72d30b27924bccffae7028de5499ce610943cc91 (diff)
downloadffmpeg-7bda4ed780c23c4bd50cf9ccd91f235e67ab0eae.tar.gz
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 <mans@mansr.com>
-rw-r--r--libavutil/arm/asm.S4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S
index ce7f46d807..50305f778b 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