diff options
| author | Michael Niedermayer | 2014-12-09 12:08:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer | 2014-12-09 12:08:29 +0100 |
| commit | 92d47e2aa3912fc9018ef10fb6272b288401ee47 (patch) | |
| tree | 5ea5fd0286881800f50c93e6fbef774afb4645f1 /libavutil/aarch64 | |
| parent | 16e65419ed3e654a04091616bd81b8c96c79c268 (diff) | |
| parent | 780cd20b00a69e26bbfffbb8eec16fbe999ea793 (diff) | |
Merge commit '780cd20b00a69e26bbfffbb8eec16fbe999ea793'
* commit '780cd20b00a69e26bbfffbb8eec16fbe999ea793':
aarch64: Use .data.rel.ro for const data with relocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/aarch64')
| -rw-r--r-- | libavutil/aarch64/asm.S | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S index c6adf6e112..ff34e7a5e5 100644 --- a/libavutil/aarch64/asm.S +++ b/libavutil/aarch64/asm.S @@ -52,12 +52,18 @@ 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 -#ifndef __MACH__ +#if HAVE_SECTION_DATA_REL_RO +.if \relocate + .section .data.rel.ro +.else + .section .rodata +.endif +#elif !defined(__MACH__) .section .rodata #else .const_data |