diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-06-29 13:35:08 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-07-01 11:25:06 +0100 |
| commit | 62634158b7cd39ad1e330a87153a97bf3dc6f8de (patch) | |
| tree | 3b5bb36649f0e08a5675c474b29200c5f0b155b7 /libavcodec/arm/vp8_armv6.S | |
| parent | ceabc13f129cd6344b1eebdbe10119083fe5520e (diff) | |
| download | ffmpeg-62634158b7cd39ad1e330a87153a97bf3dc6f8de.tar.gz | |
ARM: generate position independent code to access data symbols
This creates proper position independent code when accessing
data symbols if CONFIG_PIC is set.
References to external symbols should now use the movrelx macro.
Some additional code changes are required since this macro may
need a register to hold the GOT pointer.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/arm/vp8_armv6.S')
| -rw-r--r-- | libavcodec/arm/vp8_armv6.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/arm/vp8_armv6.S b/libavcodec/arm/vp8_armv6.S index 1fa6d15617..1b668bcd2a 100644 --- a/libavcodec/arm/vp8_armv6.S +++ b/libavcodec/arm/vp8_armv6.S @@ -65,7 +65,7 @@ T orrcs \cw, \cw, \t1 function ff_decode_block_coeffs_armv6, export=1 push {r0,r1,r4-r11,lr} - movrel lr, X(ff_vp56_norm_shift) + movrelx lr, X(ff_vp56_norm_shift) ldrd r4, r5, [sp, #44] @ token_prob, qmul cmp r3, #0 ldr r11, [r5] @@ -206,7 +206,7 @@ A orrcs r8, r8, r10, lsl r6 mov r9, #8 it ge addge r12, r12, #1 - movrel r4, X(ff_vp8_dct_cat_prob) + movrelx r4, X(ff_vp8_dct_cat_prob), r1 lsl r9, r9, r12 ldr r4, [r4, r12, lsl #2] add r12, r9, #3 |