commit e250cb82e55e47009fdddbebaec9c3f09b36a41b
author Vladimir Marko <vmarko@google.com> Thu Aug 04 15:55:03 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 04 15:55:04 2016 +0000
tree d8247bfddb7021cc6248a2db85ee7eef6d43b0fb
parent 965c0b9f98a4acbec7be148291196e30784bba2d
parent 603b7caa6309c9ade9254d8bc36f52082887b88d

Merge "x86/x86-64: Fix suspend entrypoint assembly for Mac build."

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 1d5534a..68ba0cf 100644
--- a/runtime/arch/x86/quick_entrypoints_x86.S
+++ b/runtime/arch/x86/quick_entrypoints_x86.S
@@ -1462,7 +1462,7 @@
     CFI_ADJUST_CFA_OFFSET(12)
     pushl %fs:THREAD_SELF_OFFSET                      // pass Thread::Current()
     CFI_ADJUST_CFA_OFFSET(4)
-    call artTestSuspendFromCode                       // artTestSuspendFromCode(Thread*)
+    call SYMBOL(artTestSuspendFromCode)               // (Thread*)
     addl MACRO_LITERAL(16), %esp                      // pop arguments
     CFI_ADJUST_CFA_OFFSET(-16)
     RESTORE_SAVE_EVERYTHING_CALLEE_SAVE_FRAME         // restore frame up to return address

runtime/arch/x86_64/quick_entrypoints_x86_64.S

diff --git a/runtime/arch/x86_64/quick_entrypoints_x86_64.S b/runtime/arch/x86_64/quick_entrypoints_x86_64.S
index ff91910..3048404 100644
--- a/runtime/arch/x86_64/quick_entrypoints_x86_64.S
+++ b/runtime/arch/x86_64/quick_entrypoints_x86_64.S
@@ -1430,7 +1430,7 @@
     SETUP_SAVE_EVERYTHING_CALLEE_SAVE_FRAME     // save everything for GC
     // Outgoing argument set up
     movq %gs:THREAD_SELF_OFFSET, %rdi           // pass Thread::Current()
-    call artTestSuspendFromCode                 // artTestSuspendFromCode(Thread*)
+    call SYMBOL(artTestSuspendFromCode)         // (Thread*)
     RESTORE_SAVE_EVERYTHING_CALLEE_SAVE_FRAME   // restore frame up to return address
     ret
 END_FUNCTION art_quick_test_suspend