commit 48160e72cf4dc0a7a99fb2276e0d20d602e9151f
author Ian Rogers <irogers@google.com> Tue Aug 26 10:34:09 2014 -0700
committer Ian Rogers <irogers@google.com> Tue Aug 26 10:34:09 2014 -0700
tree 3e589745bd0c0ff5b1b303118beeb62f9d0e4aab
parent 3531973c770269d82ea36a65b5738b1587c4d513

Fix usage of literals within a macro.

Macs handle arguments in macros as $num meaning literals must be $$num.

Change-Id: Ia30c7ef4e089561e9f23f353d7080e800b117d70

runtime/arch/x86/quick_entrypoints_x86.S

diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S
index debc922..a21d672 100644
--- a/runtime/arch/x86/quick_entrypoints_x86.S
+++ b/runtime/arch/x86/quick_entrypoints_x86.S
@@ -408,7 +408,7 @@
     SETUP_REF_ONLY_CALLEE_SAVE_FRAME  // save ref containing registers for GC
     mov %esp, %ebx                // remember SP
     mov 32(%esp), %edx            // get referrer
-    subl LITERAL(12), %esp        // alignment padding
+    subl MACRO_LITERAL(12), %esp  // alignment padding
     CFI_ADJUST_CFA_OFFSET(12)
     PUSH ebx                      // pass SP
     pushl %fs:THREAD_SELF_OFFSET  // pass Thread::Current()
@@ -418,7 +418,7 @@
     PUSH ecx                      // pass arg2
     PUSH eax                      // pass arg1
     call VAR(cxx_name, 1)     // cxx_name(arg1, arg2, referrer, Thread*, SP)
-    addl LITERAL(32), %esp        // pop arguments
+    addl MACRO_LITERAL(32), %esp  // pop arguments
     CFI_ADJUST_CFA_OFFSET(-32)
     RESTORE_REF_ONLY_CALLEE_SAVE_FRAME  // restore frame up to return address
     CALL_MACRO(return_macro, 2)   // return or deliver exception