[FFmpeg-cvslog] x86inc: Remove .rodata kludges
Henrik Gramner
git at videolan.org
Wed Oct 9 14:36:46 CEST 2013
ffmpeg | branch: master | Henrik Gramner <henrik at gramner.com> | Wed Sep 11 17:49:25 2013 +0200| [ad7d7d4f6a1347d81c349bfbf16632047264e6bf] | committer: Derek Buitenhuis
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 at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad7d7d4f6a1347d81c349bfbf16632047264e6bf
---
libavutil/x86/x86inc.asm | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm
index 1aedb3b..cd42caf 100644
--- a/libavutil/x86/x86inc.asm
+++ b/libavutil/x86/x86inc.asm
@@ -6,7 +6,7 @@
;* Authors: Loren Merritt <lorenm at u.washington.edu>
;* Anton Mitrofanov <BugMaster at narod.ru>
;* Jason Garrett-Glaser <darkshikari at gmail.com>
-;* Henrik Gramner <hengar-6 at student.ltu.se>
+;* Henrik Gramner <henrik at 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
More information about the ffmpeg-cvslog
mailing list