Commit 0cf0b02c authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

Merge "x86inc: fix compilation with NASM

parents 11f2d4df 7ddb5f59
...@@ -234,10 +234,10 @@ ALIGNMODE k7 ...@@ -234,10 +234,10 @@ ALIGNMODE k7
%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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment