diff options
| author | 2014-09-05 05:02:20 +0000 | |
|---|---|---|
| committer | 2014-09-05 05:02:20 +0000 | |
| commit | 194b032b6d43299e117292494064d54ecf4ddbd8 (patch) | |
| tree | 4279358b0d6c01f8dad074fb64f8f447df78f991 | |
| parent | 4229998b4e5f69763489732e1048da6b77dd2a34 (diff) | |
| parent | 62aa66f8532b8eb44e882596010b33e7781b0754 (diff) | |
Merge "Revert "x86: Fix art_quick_instrumentation_exit""
| -rw-r--r-- | runtime/arch/x86/quick_entrypoints_x86.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S index 24dc318483..337e5fe89a 100644 --- a/runtime/arch/x86/quick_entrypoints_x86.S +++ b/runtime/arch/x86/quick_entrypoints_x86.S @@ -1258,7 +1258,7 @@ DEFINE_FUNCTION art_quick_instrumentation_entry 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), %ebx + movl SYMBOL(art_quick_instrumentation_exit)@GOT(%ebx), %ebx movl %ebx, 32(%esp) // Place instrumentation exit as return pc. movl (%esp), %eax // Restore eax. |