Commit ad7d7d4f authored by Henrik Gramner's avatar Henrik Gramner Committed by 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: 's avatarDerek Buitenhuis <derek.buitenhuis@gmail.com>
parent 9e3946aa
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
;* Authors: Loren Merritt <lorenm@u.washington.edu> ;* Authors: Loren Merritt <lorenm@u.washington.edu>
;* Anton Mitrofanov <BugMaster@narod.ru> ;* Anton Mitrofanov <BugMaster@narod.ru>
;* Jason Garrett-Glaser <darkshikari@gmail.com> ;* 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 ;* Permission to use, copy, modify, and/or distribute this software for any
;* purpose with or without fee is hereby granted, provided that the above ;* purpose with or without fee is hereby granted, provided that the above
...@@ -62,23 +62,17 @@ ...@@ -62,23 +62,17 @@
%define mangle(x) x %define mangle(x) x
%endif %endif
; Name of the .rodata section. ; aout does not support align=
; Kludge: Something on OS X fails to align .rodata even given an align attribute, ; NOTE: This section is out of sync with x264, in order to
; so use a different read-only section. ; keep supporting OS/2.
%macro SECTION_RODATA 0-1 16 %macro SECTION_RODATA 0-1 16
%ifidn __OUTPUT_FORMAT__,macho64 %ifidn __OUTPUT_FORMAT__,aout
SECTION .text align=%1
%elifidn __OUTPUT_FORMAT__,macho
SECTION .text align=%1
fakegot:
%elifidn __OUTPUT_FORMAT__,aout
section .text section .text
%else %else
SECTION .rodata align=%1 SECTION .rodata align=%1
%endif %endif
%endmacro %endmacro
; aout does not support align=
%macro SECTION_TEXT 0-1 16 %macro SECTION_TEXT 0-1 16
%ifidn __OUTPUT_FORMAT__,aout %ifidn __OUTPUT_FORMAT__,aout
SECTION .text SECTION .text
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment