RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-18 05:24:42 +00:00
Code Issues Projects Releases Wiki Activity

HACK: fix compilation with NASM.

Browse Source 
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: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2011-11-08 20:10:44 +01:00
parent dbb38bc389
commit 03f1caec61
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavutil/x86/x86inc.asm
View File

@ -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.
%macro cglobal 1-2+ ; name, [PROLOGUE args]
%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
%endif
%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
%endif
%endif
%endmacro
%macro cglobal_internal 1-2+
@ -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
%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
%endif
%endmacro
%macro call_internal 2
%xdefine %%i %1