ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Fri Mar 30 15:48:17 2018 -0300| [33bd2b99a1c2cf3fc8b810a11c6615a37d9f9cf4] | committer: James Almer
Merge commit '3a7b4ae62c798edbd82bcd8fef863c74ed2acd4a' * commit '3a7b4ae62c798edbd82bcd8fef863c74ed2acd4a': arm: Produce .const_data instead of .section .rodata for Mach-O Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=33bd2b99a1c2cf3fc8b810a11c6615a37d9f9cf4 --- libavutil/arm/asm.S | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index eb689a1039..6744f2a200 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 ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
