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

Bug: 30212852
Change-Id: I89f1003e73ac42c0e8d63d0fe2f2af4f24c0733d

diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S
index 1d5534a..68ba0cf 100644 (file)
--- a/runtime/arch/x86/quick_entrypoints_x86.S
+++ b/runtime/arch/x86/quick_entrypoints_x86.S
@@ -1462,7 +1462,7 @@ DEFINE_FUNCTION art_quick_test_suspend
     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

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 (file)
--- a/runtime/arch/x86_64/quick_entrypoints_x86_64.S
+++ b/runtime/arch/x86_64/quick_entrypoints_x86_64.S
@@ -1430,7 +1430,7 @@ DEFINE_FUNCTION art_quick_test_suspend
     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