diff options
| author | James Almer <jamrial@gmail.com> | 2018-03-30 15:48:17 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-03-30 15:48:17 -0300 |
| commit | 33bd2b99a1c2cf3fc8b810a11c6615a37d9f9cf4 (patch) | |
| tree | b41d3ced4e0fcac138771ba4b31d048753133775 /libavutil | |
| parent | a7109b82c4ab86a7ae75ad34245af918f1a26b95 (diff) | |
| parent | 3a7b4ae62c798edbd82bcd8fef863c74ed2acd4a (diff) | |
| download | ffmpeg-streaming-33bd2b99a1c2cf3fc8b810a11c6615a37d9f9cf4.zip ffmpeg-streaming-33bd2b99a1c2cf3fc8b810a11c6615a37d9f9cf4.tar.gz | |
Merge commit '3a7b4ae62c798edbd82bcd8fef863c74ed2acd4a'
* commit '3a7b4ae62c798edbd82bcd8fef863c74ed2acd4a':
arm: Produce .const_data instead of .section .rodata for Mach-O
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/arm/asm.S | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index eb689a1..6744f2a 100644 --- a/libavutil/arm/asm.S +++ b/libavutil/arm/asm.S @@ -111,11 +111,17 @@ FUNC .func \name ELF .size \name, . - \name .purgem endconst .endm -.if HAVE_SECTION_DATA_REL_RO && \relocate +#if HAVE_SECTION_DATA_REL_RO +.if \relocate .section .data.rel.ro .else .section .rodata .endif +#elif !defined(__MACH__) + .section .rodata +#else + .const_data +#endif .align \align \name: .endm |
