diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-09 14:27:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-09 14:29:42 +0200 |
| commit | 31d0d355608fc9dfaed55b7541f16cd105fb3995 (patch) | |
| tree | adcf71f7da6cdff5a20f048f250ea5cabc35a9e8 /libavutil | |
| parent | 4ce82e6fa94c96ec2db76ce3be200e58f0a577c3 (diff) | |
| parent | ad7d7d4f6a1347d81c349bfbf16632047264e6bf (diff) | |
| download | ffmpeg-31d0d355608fc9dfaed55b7541f16cd105fb3995.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86inc: Remove .rodata kludges
Conflicts:
libavutil/x86/x86inc.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/x86inc.asm | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index 90441a7f99..c8b2fb605a 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -6,7 +6,7 @@ ;* Authors: Loren Merritt <lorenm@u.washington.edu> ;* Anton Mitrofanov <BugMaster@narod.ru> ;* Jason Garrett-Glaser <darkshikari@gmail.com> -;* Henrik Gramner <hengar-6@student.ltu.se> +;* Henrik Gramner <henrik@gramner.com> ;* ;* Permission to use, copy, modify, and/or distribute this software for any ;* purpose with or without fee is hereby granted, provided that the above @@ -62,42 +62,17 @@ %define mangle(x) x %endif -; Name of the .rodata section. +; aout does not support align= +; NOTE: This section is out of sync with x264, in order to +; keep supporting OS/2. %macro SECTION_RODATA 0-1 16 - ; Kludge: Something on OS X fails to align .rodata even given an align - ; attribute, so use a different read-only section. This has been fixed in - ; yasm 0.8.0 and nasm 2.6. - %ifdef __YASM_VERSION_ID__ - %if __YASM_VERSION_ID__ < 00080000h - %define NEED_MACHO_RODATA_KLUDGE - %endif - %elifdef __NASM_VERSION_ID__ - %if __NASM_VERSION_ID__ < 02060000h - %define NEED_MACHO_RODATA_KLUDGE - %endif - %endif - %ifidn __OUTPUT_FORMAT__,aout section .text %else - %ifndef NEED_MACHO_RODATA_KLUDGE - SECTION .rodata align=%1 - %else - %ifidn __OUTPUT_FORMAT__,macho64 - SECTION .text align=%1 - %elifidn __OUTPUT_FORMAT__,macho - SECTION .text align=%1 - fakegot: - %else - SECTION .rodata align=%1 - %endif - %endif + SECTION .rodata align=%1 %endif - - %undef NEED_MACHO_RODATA_KLUDGE %endmacro -; aout does not support align= %macro SECTION_TEXT 0-1 16 %ifidn __OUTPUT_FORMAT__,aout SECTION .text |