From 03f1caec616023bd3b3e80888fec6afc94622d9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Tue, 8 Nov 2011 20:10:44 +0100 Subject: [PATCH] HACK: fix compilation with NASM. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- libavutil/x86/x86inc.asm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index 842a2ccd27..4e1eef5bb7 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -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