RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix compilation with NASM. 

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2012-04-15 19:31:40 +02:00
parent dd5e1fc22e
commit 9b1f776d75
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavutil/x86/x86inc.asm
View File

@ -116,7 +116,11 @@
%endif %endif
; Always use long nops (reduces 0x90 spam in disassembly on x86_32) ; 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 CPU amdnop
%endif
; Macros to eliminate most code duplication between x86_32 and x86_64: ; Macros to eliminate most code duplication between x86_32 and x86_64:
; Currently this works only for leaf functions which load all their arguments ; Currently this works only for leaf functions which load all their arguments
@ -161,10 +165,10 @@ CPU amdnop
%define r%1mp %2 %define r%1mp %2
%elif ARCH_X86_64 ; memory %elif ARCH_X86_64 ; memory
%define r%1m [rsp + stack_offset + %6] %define r%1m [rsp + stack_offset + %6]
%define r%1mp qword r %+ %1m %define r%1mp qword r %+ %1 %+ m
%else %else
%define r%1m [esp + stack_offset + %6] %define r%1m [esp + stack_offset + %6]
%define r%1mp dword r %+ %1m %define r%1mp dword r %+ %1 %+ m
%endif %endif
%define r%1 %2 %define r%1 %2
%endmacro %endmacro