ART: Fix asm literals for Mac builds.
Change-Id: Ief922e1e06811b8ec25771b9854376fae3e07929
diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S
index c5e1914..151f51f 100644
--- a/runtime/arch/x86/quick_entrypoints_x86.S
+++ b/runtime/arch/x86/quick_entrypoints_x86.S
@@ -457,7 +457,7 @@
// Enumerate the possible cases for loading GPRS.
// edx (and maybe ebx):
SKIP_OVER_FLOATS .Lgpr_setup_finished
- cmpb MACRO_LITERAL(74), %al // if (al == 'J') goto FOUND_LONG
+ cmpb LITERAL(74), %al // if (al == 'J') goto FOUND_LONG
je .LfirstLong
// Must be an integer value.
movl (%edi), %edx
@@ -549,7 +549,7 @@
// Enumerate the possible cases for loading GPRS.
// ecx (and maybe edx)
SKIP_OVER_FLOATS .Lgpr_setup_finished2
- cmpb MACRO_LITERAL(74), %al // if (al == 'J') goto FOUND_LONG
+ cmpb LITERAL(74), %al // if (al == 'J') goto FOUND_LONG
je .LfirstLong2
// Must be an integer value. Load into ECX.
movl (%edi), %ecx
@@ -557,7 +557,7 @@
// Now check edx (and maybe ebx).
SKIP_OVER_FLOATS .Lgpr_setup_finished2
- cmpb MACRO_LITERAL(74), %al // if (al == 'J') goto FOUND_LONG
+ cmpb LITERAL(74), %al // if (al == 'J') goto FOUND_LONG
je .LSecondLong2
// Must be an integer. Load into EDX.
movl (%edi), %edx
@@ -1375,7 +1375,7 @@
// Tear down the callee-save frame.
// Remove space for FPR args and EAX
- addl MACRO_LITERAL(4 + 4 * 8), %esp
+ addl LITERAL(4 + 4 * 8), %esp
CFI_ADJUST_CFA_OFFSET(-(4 + 4 * 8))
POP ecx
@@ -1415,7 +1415,7 @@
movd %edx, %xmm1
punpckldq %xmm1, %xmm0
- addl MACRO_LITERAL(48), %esp // Remove FPRs and EAX, ECX, EDX, EBX.
+ addl LITERAL(48), %esp // Remove FPRs and EAX, ECX, EDX, EBX.
CFI_ADJUST_CFA_OFFSET(-48)
POP ebp // Restore callee saves