From d5fa1cc72f53d3ee5e1bb2b9c5be2a45959273c4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 24 Mar 2017 13:28:37 +0100 Subject: import --- x86inc-nasm.patch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 x86inc-nasm.patch (limited to 'x86inc-nasm.patch') diff --git a/x86inc-nasm.patch b/x86inc-nasm.patch new file mode 100644 index 0000000..079ac08 --- /dev/null +++ b/x86inc-nasm.patch @@ -0,0 +1,25 @@ +commit 7ddb5f599286ab4ce7de4061ab94828cdfee36c6 +Author: KO Myung-Hun +Date: Tue Jul 22 10:47:20 2014 +0900 + + x86inc: fix compilation with NASM + + Change-Id: I5978921ab1ccad6648a5bde6ad023c3e3430f5f4 + +diff --git a/third_party/x86inc/x86inc.asm b/third_party/x86inc/x86inc.asm +index 2134676..99453a9 100644 +--- 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 -- cgit