commit 62aa66f8532b8eb44e882596010b33e7781b0754
author Andreas Gampe <agampe@google.com> Fri Sep 05 05:02:08 2014 +0000
committer Andreas Gampe <agampe@google.com> Fri Sep 05 05:02:08 2014 +0000
tree 928cadcdceb8c17ee9284a8d055390d0bc8cdf46
parent 5324dc896b69fc14a24334f52169e2319b9b3842

Revert "x86: Fix art_quick_instrumentation_exit"

GCC 4.8 can't handle it correctly.

This reverts commit 5324dc896b69fc14a24334f52169e2319b9b3842.

Change-Id: I2478a52f147b585658d0e5769c3fce7f2c75240e

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 24dc318..337e5fe 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), %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.