From f601d1954348b71186fa160a0ae6a1f4f1c5aee6 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Mon, 26 Jan 2015 18:07:14 +0000 Subject: [PATCH] ART: Fix assembler labels' usage in macros for Mac. Change-Id: I99552528329a7f2cd5656eef0210c831cfc5fe09 --- runtime/arch/x86/quick_entrypoints_x86.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S index 151f51feb..b245dc3fe 100644 --- a/runtime/arch/x86/quick_entrypoints_x86.S +++ b/runtime/arch/x86/quick_entrypoints_x86.S @@ -357,7 +357,7 @@ MACRO2(LOOP_OVER_SHORTY_LOADING_XMMS, xmm_reg, finished) movb (%ebx), %al // al := *shorty addl MACRO_LITERAL(1), %ebx // shorty++ cmpb MACRO_LITERAL(0), %al // if (al == '\0') goto xmm_setup_finished - je VAR(finished, 1) + je RAW_VAR(finished, 1) cmpb MACRO_LITERAL(68), %al // if (al == 'D') goto FOUND_DOUBLE je 2f cmpb MACRO_LITERAL(70), %al // if (al == 'F') goto FOUND_FLOAT @@ -388,7 +388,7 @@ MACRO1(SKIP_OVER_FLOATS, finished) movb (%esi), %al // al := *shorty addl MACRO_LITERAL(1), %esi // shorty++ cmpb MACRO_LITERAL(0), %al // if (al == '\0') goto gpr_setup_finished - je VAR(finished, 2) + je RAW_VAR(finished, 0) cmpb MACRO_LITERAL(70), %al // if (al == 'F') goto SKIP_FLOAT je 3f cmpb MACRO_LITERAL(68), %al // if (al == 'D') goto SKIP_DOUBLE -- 2.11.0