commit b14339904c9cacc4af74260c7325e4eb32947f95
author Andreas Gampe <agampe@google.com> Fri Sep 05 17:19:23 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 05 17:19:24 2014 +0000
tree 6b64fcc3f530b6bb40e713ad1373fd5b82bfca7c
parent e5de88328353cbd4f3b313d26529ebb9c10c41c3
parent 871bfdcacbce7db574c4d1007f0065e65db26a7f

Merge "Revert "Revert "x86: Fix art_quick_instrumentation_exit"""

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..4155b7e 100644
--- a/runtime/arch/x86/quick_entrypoints_x86.S
+++ b/runtime/arch/x86/quick_entrypoints_x86.S
@@ -1255,6 +1255,7 @@
     PUSH ecx                      // Pass receiver.
     PUSH eax                      // Pass Method*.
     call SYMBOL(artInstrumentationMethodEntryFromCode) // (Method*, Object*, Thread*, SP, LR)
+    SETUP_GOT_NOSAVE
     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.