diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-22 03:44:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-22 03:44:27 +0000 |
| commit | 71c4cea525eb6a84d0763a42d241f50c9c2ac8d2 (patch) | |
| tree | 963484f502974c7c7f06566b31ba6b7b3226ec81 | |
| parent | 4918e1ca05d0ec1510c7e997c5ae94cf6ce52045 (diff) | |
| parent | 6c480d6050aab315a8592f2d671f40b8179f28dd (diff) | |
| download | art-71c4cea525eb6a84d0763a42d241f50c9c2ac8d2.zip art-71c4cea525eb6a84d0763a42d241f50c9c2ac8d2.tar.gz art-71c4cea525eb6a84d0763a42d241f50c9c2ac8d2.tar.bz2 | |
Merge "Fix Mac build."
| -rw-r--r-- | runtime/arch/x86/quick_entrypoints_x86.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S index a1fdcf1..69527ce 100644 --- a/runtime/arch/x86/quick_entrypoints_x86.S +++ b/runtime/arch/x86/quick_entrypoints_x86.S @@ -30,7 +30,7 @@ MACRO2(SETUP_SAVE_ALL_CALLEE_SAVE_FRAME, got_reg, temp_reg) CFI_ADJUST_CFA_OFFSET(12) SETUP_GOT_NOSAVE RAW_VAR(got_reg, 0) // Load Runtime::instance_ from GOT. - movl _ZN3art7Runtime9instance_E@GOT(REG_VAR(got_reg, 0)), REG_VAR(temp_reg, 1) + movl SYMBOL(_ZN3art7Runtime9instance_E)@GOT(REG_VAR(got_reg, 0)), REG_VAR(temp_reg, 1) movl (REG_VAR(temp_reg, 1)), REG_VAR(temp_reg, 1) // Push save all callee-save method. pushl RUNTIME_SAVE_ALL_CALLEE_SAVE_FRAME_OFFSET(REG_VAR(temp_reg, 1)) @@ -56,7 +56,7 @@ MACRO2(SETUP_REFS_ONLY_CALLEE_SAVE_FRAME, got_reg, temp_reg) CFI_ADJUST_CFA_OFFSET(12) SETUP_GOT_NOSAVE VAR(got_reg, 0) // Load Runtime::instance_ from GOT. - movl _ZN3art7Runtime9instance_E@GOT(REG_VAR(got_reg, 0)), REG_VAR(temp_reg, 1) + movl SYMBOL(_ZN3art7Runtime9instance_E)@GOT(REG_VAR(got_reg, 0)), REG_VAR(temp_reg, 1) movl (REG_VAR(temp_reg, 1)), REG_VAR(temp_reg, 1) // Push save all callee-save method. pushl RUNTIME_REFS_ONLY_CALLEE_SAVE_FRAME_OFFSET(REG_VAR(temp_reg, 1)) @@ -92,7 +92,7 @@ MACRO2(SETUP_REFS_AND_ARGS_CALLEE_SAVE_FRAME, got_reg, temp_reg) PUSH ecx SETUP_GOT_NOSAVE VAR(got_reg, 0) // Load Runtime::instance_ from GOT. - movl _ZN3art7Runtime9instance_E@GOT(REG_VAR(got_reg, 0)), REG_VAR(temp_reg, 1) + movl SYMBOL(_ZN3art7Runtime9instance_E)@GOT(REG_VAR(got_reg, 0)), REG_VAR(temp_reg, 1) movl (REG_VAR(temp_reg, 1)), REG_VAR(temp_reg, 1) // Push save all callee-save method. pushl RUNTIME_REFS_AND_ARGS_CALLEE_SAVE_FRAME_OFFSET(REG_VAR(temp_reg, 1)) @@ -446,7 +446,7 @@ MACRO3(THREE_ARG_REF_DOWNCALL, c_name, cxx_name, return_macro) SETUP_REFS_ONLY_CALLEE_SAVE_FRAME ebx, ebx // save ref containing registers for GC // Outgoing argument set up mov FRAME_SIZE_REFS_ONLY_CALLEE_SAVE(%esp), %ebx // get referrer - subl LITERAL(12), %esp // alignment padding + subl MACRO_LITERAL(12), %esp // alignment padding CFI_ADJUST_CFA_OFFSET(12) pushl %fs:THREAD_SELF_OFFSET // pass Thread::Current() CFI_ADJUST_CFA_OFFSET(4) |