mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-07 00:20:09 +02:00
x86inc: fully concatenate tokens to fix macro expansion for nasm
Fixes build errors with nasm introduced in 6f40e9f070
for stack
memory alignment. Noticed by BugMaster.
This commit is contained in:
parent
0eae920c3c
commit
0995ad8db4
@ -153,10 +153,10 @@ CPUNOP amdnop
|
|||||||
%define r%1mp %2
|
%define r%1mp %2
|
||||||
%elif ARCH_X86_64 ; memory
|
%elif ARCH_X86_64 ; memory
|
||||||
%define r%1m [rstk + stack_offset + %3]
|
%define r%1m [rstk + stack_offset + %3]
|
||||||
%define r%1mp qword r %+ %1m
|
%define r%1mp qword r %+ %1 %+ m
|
||||||
%else
|
%else
|
||||||
%define r%1m [rstk + stack_offset + %3]
|
%define r%1m [rstk + stack_offset + %3]
|
||||||
%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
|
||||||
|
Loading…
Reference in New Issue
Block a user