Merge commit 'a238b83b13640e3192d7d4aaad2242f13a9a84a1'

* commit 'a238b83b13640e3192d7d4aaad2242f13a9a84a1': aarch64: use MACH-O const data asm directive in const macro Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 04:06:30 +02:00 · 2014-08-04 04:06:30 +02:00 · 66eacd5580
parent 7fd60d1e7a a238b83b13
commit 66eacd5580
1 changed files with 4 additions and 0 deletions
--- a/libavutil/aarch64/asm.S
+++ b/libavutil/aarch64/asm.S
@ -57,7 +57,11 @@ FUNC    .func   \name
 ELF     .size   \name, . - \name
        .purgem endconst
    .endm
+#ifndef __MACH__
        .section        .rodata
+#else
+        .const_data
+#endif
        .align          \align
 \name:
 .endm