diff options
| author | Henrik Gramner <henrik@gramner.com> | 2013-09-11 17:49:25 +0200 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2013-10-09 07:44:30 -0400 |
| commit | ad7d7d4f6a1347d81c349bfbf16632047264e6bf (patch) | |
| tree | 9919d65740c759d372474e30c6ba74d71052cc8d /libavutil/x86 | |
| parent | 9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1 (diff) | |
| download | ffmpeg-ad7d7d4f6a1347d81c349bfbf16632047264e6bf.tar.gz | |
x86inc: Remove .rodata kludges
The Mach-O bug was fixed in yasm 0.8.0 and we don't
support versions that old anymore.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavutil/x86')
| -rw-r--r-- | libavutil/x86/x86inc.asm | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index 1aedb3b651..cd42cafaf8 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,23 +62,17 @@ %define mangle(x) x %endif -; Name of the .rodata section. -; Kludge: Something on OS X fails to align .rodata even given an align attribute, -; so use a different read-only 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 - %ifidn __OUTPUT_FORMAT__,macho64 - SECTION .text align=%1 - %elifidn __OUTPUT_FORMAT__,macho - SECTION .text align=%1 - fakegot: - %elifidn __OUTPUT_FORMAT__,aout + %ifidn __OUTPUT_FORMAT__,aout section .text %else SECTION .rodata align=%1 %endif %endmacro -; aout does not support align= %macro SECTION_TEXT 0-1 16 %ifidn __OUTPUT_FORMAT__,aout SECTION .text |