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 /libavutil/arm | |
| parent | 99bf26fc6b17c05e9e1ec598a714c5efe1b978f6 (diff) | |
| parent | f963f80399deb1a2b44c1bac3af7123e8a0c9e46 (diff) | |
| download | ffmpeg-16e65419ed3e654a04091616bd81b8c96c79c268.tar.gz | |
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 'libavutil/arm')
| -rw-r--r-- | libavutil/arm/asm.S | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index 35559ce27a..1d0e5a97b2 100644 --- a/libavutil/arm/asm.S +++ b/libavutil/arm/asm.S @@ -89,12 +89,16 @@ FUNC .func \name .endif .endm -.macro const name, align=2 +.macro const name, align=2, relocate=0 .macro endconst ELF .size \name, . - \name .purgem endconst .endm +.if HAVE_SECTION_DATA_REL_RO && \relocate + .section .data.rel.ro +.else .section .rodata +.endif .align \align \name: .endm |