commit 7ac7e32fb84b6a933181d31694d8a2d81ddca6d6
author Elliott Hughes <enh@google.com> Fri Jun 27 17:20:59 2014 -0700
committer Elliott Hughes <enh@google.com> Sat Jun 28 10:09:21 2014 -0700
tree 722445c5c19114365e7b0e8b8a652e21fdca3db0
parent 5703029de6c56c6f85b3ecbd4e2eee80e025772d

Fix the x86 textrel and remove -Wl,--no-fatal-warnings.

Bug: 11358761
Change-Id: I825cecce121a9011f74c5fdf77d1fbecd30adbc7

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 ecd8ce6..0326f9e 100644
--- a/runtime/arch/x86/quick_entrypoints_x86.S
+++ b/runtime/arch/x86/quick_entrypoints_x86.S
@@ -1247,11 +1247,12 @@
     PUSH ecx                      // Pass receiver.
     PUSH eax                      // Pass Method*.
     SETUP_GOT_NOSAVE              // clobbers EBX
-    call SYMBOL(artInstrumentationMethodEntryFromCode) // (Method*, Object*, Thread*, SP, LR)
-    addl  LITERAL(28), %esp       // Pop arguments upto saved Method*.
+    call PLT_SYMBOL(artInstrumentationMethodEntryFromCode) // (Method*, Object*, Thread*, SP, LR)
+    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 LITERAL(SYMBOL(art_quick_instrumentation_exit)), 32(%esp)
+    movl SYMBOL(art_quick_instrumentation_exit)@GOT(%ebx), %ebx
+    movl %ebx, 32(%esp)
                                   // Place instrumentation exit as return pc.
     movl (%esp), %eax             // Restore eax.
     movl 8(%esp), %ecx            // Restore ecx.