From 9b1f776d751472e8a376b412d02a96a35044e2a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Sun, 15 Apr 2012 19:31:40 +0200 Subject: [PATCH] Fix compilation with NASM. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Reimar Döffinger --- libavutil/x86/x86inc.asm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index d4f6926d08..971d210848 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -116,7 +116,11 @@ %endif ; Always use long nops (reduces 0x90 spam in disassembly on x86_32) +; Not supported by NASM (except via smartalign package + ALIGNMODE k8, +; however that fails when used together with the -M option) +%ifdef __YASM_VER__ CPU amdnop +%endif ; Macros to eliminate most code duplication between x86_32 and x86_64: ; Currently this works only for leaf functions which load all their arguments @@ -161,10 +165,10 @@ CPU amdnop %define r%1mp %2 %elif ARCH_X86_64 ; memory %define r%1m [rsp + stack_offset + %6] - %define r%1mp qword r %+ %1m + %define r%1mp qword r %+ %1 %+ m %else %define r%1m [esp + stack_offset + %6] - %define r%1mp dword r %+ %1m + %define r%1mp dword r %+ %1 %+ m %endif %define r%1 %2 %endmacro