diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-09 11:58:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-09 11:58:13 +0100 |
| commit | 16e65419ed3e654a04091616bd81b8c96c79c268 (patch) | |
| tree | 46e91a52bd14f4eee55c144675c321249d78ef98 /libavcodec/arm | |
| parent | 99bf26fc6b17c05e9e1ec598a714c5efe1b978f6 (diff) | |
| parent | f963f80399deb1a2b44c1bac3af7123e8a0c9e46 (diff) | |
Merge commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46'
* commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46':
arm: Use .data.rel.ro for const data with relocations
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/fft_fixed_neon.S | 2 | ||||
| -rw-r--r-- | libavcodec/arm/fft_neon.S | 2 | ||||
| -rw-r--r-- | libavcodec/arm/fft_vfp.S | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/arm/fft_fixed_neon.S b/libavcodec/arm/fft_fixed_neon.S index 57a8cfb557..2651607544 100644 --- a/libavcodec/arm/fft_fixed_neon.S +++ b/libavcodec/arm/fft_fixed_neon.S @@ -242,7 +242,7 @@ function ff_fft_fixed_calc_neon, export=1 bx r3 endfunc -const fft_fixed_tab_neon +const fft_fixed_tab_neon, relocate=1 .word fft4_neon .word fft8_neon .word fft16_neon diff --git a/libavcodec/arm/fft_neon.S b/libavcodec/arm/fft_neon.S index 8b9ae2a82d..48f8dfc424 100644 --- a/libavcodec/arm/fft_neon.S +++ b/libavcodec/arm/fft_neon.S @@ -348,7 +348,7 @@ function ff_fft_permute_neon, export=1 pop {r4,pc} endfunc -const fft_tab_neon +const fft_tab_neon, relocate=1 .word fft4_neon .word fft8_neon .word fft16_neon diff --git a/libavcodec/arm/fft_vfp.S b/libavcodec/arm/fft_vfp.S index 27be91293e..ac601325f2 100644 --- a/libavcodec/arm/fft_vfp.S +++ b/libavcodec/arm/fft_vfp.S @@ -33,7 +33,7 @@ function ff_fft_calc_vfp, export=1 movrel a2, (fft_tab_vfp - 8) ldr pc, [a2, ip, lsl #2] endfunc -const fft_tab_vfp +const fft_tab_vfp, relocate=1 .word fft4_vfp .word fft8_vfp .word X(ff_fft16_vfp) @ this one alone is exported |