commit 5324dc896b69fc14a24334f52169e2319b9b3842
author Dmitry Petrochenko <dmitry.petrochenko@intel.com> Wed Aug 27 18:45:56 2014 +0700
committer Andreas Gampe <agampe@google.com> Fri Sep 05 02:47:46 2014 +0000
tree 549710afd96a9b537a67d584a259b4cd38b423fd
parent ed20a4d80bcd8d47b5bcdd51ef17c786c0e5015c

x86: Fix art_quick_instrumentation_exit

Make sure that we use a move-immediate instead of a
move-from-address (previously this was a load, whereas now
we are interested in the address as a value).

Change-Id: I4048c4a97abcc6524fe976bdc35b834d8f3bc592
Signed-off-by: Dmitry Petrochenko <dmitry.petrochenko@intel.com>

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 337e5fe..24dc318 100644
--- a/runtime/arch/x86/quick_entrypoints_x86.S
+++ b/runtime/arch/x86/quick_entrypoints_x86.S
@@ -1258,7 +1258,7 @@
     addl LITERAL(28), %esp        // Pop arguments upto saved Method*.
     movl 28(%esp), %edi           // Restore edi.
     movl %eax, 28(%esp)           // Place code* over edi, just under return pc.
-    movl SYMBOL(art_quick_instrumentation_exit)@GOT(%ebx), %ebx
+    movl $SYMBOL(art_quick_instrumentation_exit), %ebx
     movl %ebx, 32(%esp)
                                   // Place instrumentation exit as return pc.
     movl (%esp), %eax             // Restore eax.