Merge "x86inc: fix compilation with NASM

0cf0b02c · James Zern · Gerrit Code Review · 11f2d4df · 7ddb5f59 · 0cf0b02c
Commit 0cf0b02c authored Jul 23, 2014 by James Zern Committed by Gerrit Code Review Jul 23, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

third_party/x86inc/x86inc.asm third_party/x86inc/x86inc.asm +2 -2

No files found.
--- a/third_party/x86inc/x86inc.asm
+++ b/third_party/x86inc/x86inc.asm
@@ -234,10 +234,10 @@ ALIGNMODE k7
        %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