ref: 0cf0b02c4c9dd7dc1338a7514a1e47588d74e704
parent: 11f2d4df952e74206e6d7edaebdfb7c7884b5a32
parent: 7ddb5f599286ab4ce7de4061ab94828cdfee36c6
author: James Zern <jzern@google.com>
date: Wed Jul 23 18:45:51 EDT 2014
Merge "x86inc: fix compilation with NASM Change-Id: I5978921ab1ccad6648a5bde6ad023c3e3430f5f4 "
--- a/third_party/x86inc/x86inc.asm
+++ b/third_party/x86inc/x86inc.asm
@@ -234,10 +234,10 @@
%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