diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 04:06:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 04:06:34 +0200 |
| commit | 66eacd55807c4b0c257d644d2ee3156a43f6ba5b (patch) | |
| tree | 11aac1df05b1dad90991816bd7435b9db19899a8 /libavutil | |
| parent | 7fd60d1e7ad032e6e926608758c5f5d736c37042 (diff) | |
| parent | a238b83b13640e3192d7d4aaad2242f13a9a84a1 (diff) | |
| download | ffmpeg-66eacd55807c4b0c257d644d2ee3156a43f6ba5b.tar.gz | |
Merge commit 'a238b83b13640e3192d7d4aaad2242f13a9a84a1'
* commit 'a238b83b13640e3192d7d4aaad2242f13a9a84a1':
aarch64: use MACH-O const data asm directive in const macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/aarch64/asm.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S index d153df69d8..c6adf6e112 100644 --- 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 |