Commit 03f1caec authored by Reimar Döffinger's avatar Reimar Döffinger

HACK: fix compilation with NASM.

This issue is actually already fixed in NASM, however it will be a
bit before it arrives everywhere.
This should work as a temporary work-around.
Signed-off-by: 's avatarReimar Döffinger <Reimar.Doeffinger@gmx.de>
parent dbb38bc3
...@@ -468,9 +468,19 @@ DECLARE_REG 6, ebp, ebp, bp, null, [esp + stack_offset + 28] ...@@ -468,9 +468,19 @@ DECLARE_REG 6, ebp, ebp, bp, null, [esp + stack_offset + 28]
; Appends cpuflags to the function name if cpuflags has been specified. ; Appends cpuflags to the function name if cpuflags has been specified.
%macro cglobal 1-2+ ; name, [PROLOGUE args] %macro cglobal 1-2+ ; name, [PROLOGUE args]
%if %0 == 1 %if %0 == 1
; HACK: work around %+ broken with empty SUFFIX for nasm 2.09.10
%ifempty SUFFIX
cglobal_internal %1
%else
cglobal_internal %1 %+ SUFFIX cglobal_internal %1 %+ SUFFIX
%endif
%else %else
; HACK: work around %+ broken with empty SUFFIX for nasm 2.09.10
%ifempty SUFFIX
cglobal_internal %1, %2
%else
cglobal_internal %1 %+ SUFFIX, %2 cglobal_internal %1 %+ SUFFIX, %2
%endif
%endif %endif
%endmacro %endmacro
%macro cglobal_internal 1-2+ %macro cglobal_internal 1-2+
...@@ -747,7 +757,12 @@ INIT_XMM ...@@ -747,7 +757,12 @@ INIT_XMM
; Append cpuflags to the callee's name iff the appended name is known and the plain name isn't ; Append cpuflags to the callee's name iff the appended name is known and the plain name isn't
%macro call 1 %macro call 1
; HACK: work around %+ broken with empty SUFFIX for nasm 2.09.10
%ifempty SUFFIX
call_internal %1, %1
%else
call_internal %1, %1 %+ SUFFIX call_internal %1, %1 %+ SUFFIX
%endif
%endmacro %endmacro
%macro call_internal 2 %macro call_internal 2
%xdefine %%i %1 %xdefine %%i %1
......
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