[x264-devel] x86inc: Remove .rodata kludges

[Henrik Gramner]

x264 | branch: master | Henrik Gramner <henrik at gramner.com> | Tue May  7 17:21:03 2013 +0200| [f12a17f5ecde41148256cb0c132cb31ac6602f3e] | committer: Jason Garrett-Glaser

x86inc: Remove .rodata kludges

The Mach-O bug was fixed in yasm 0.8.0 and we don't support versions that old.

a.out was superseded by ELF on sane systems a few decades ago.

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=f12a17f5ecde41148256cb0c132cb31ac6602f3e
---

 common/x86/x86inc.asm |   23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/common/x86/x86inc.asm b/common/x86/x86inc.asm
index 7265a0c..b5634a0 100644
--- a/common/x86/x86inc.asm
+++ b/common/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
@@ -60,29 +60,12 @@
     %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.
 %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
-        section .text
-    %else
-        SECTION .rodata align=%1
-    %endif
+    SECTION .rodata align=%1
 %endmacro
 
-; aout does not support align=
 %macro SECTION_TEXT 0-1 16
-    %ifidn __OUTPUT_FORMAT__,aout
-        SECTION .text
-    %else
-        SECTION .text align=%1
-    %endif
+    SECTION .text align=%1
 %endmacro
 
 %if WIN64