Merge commit '3a7b4ae62c798edbd82bcd8fef863c74ed2acd4a'
authorJames Almer <jamrial@gmail.com>
Fri, 30 Mar 2018 18:48:17 +0000 (15:48 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 30 Mar 2018 18:48:17 +0000 (15:48 -0300)
* commit '3a7b4ae62c798edbd82bcd8fef863c74ed2acd4a':
  arm: Produce .const_data instead of .section .rodata for Mach-O

Merged-by: James Almer <jamrial@gmail.com>
libavutil/arm/asm.S

index eb689a1..6744f2a 100644 (file)
@@ -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