From 871bfdcacbce7db574c4d1007f0065e65db26a7f Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Fri, 5 Sep 2014 05:43:34 +0000 Subject: [PATCH] Revert "Revert "x86: Fix art_quick_instrumentation_exit"" Need to use GOT to avoid TEXTREL. This reverts commit 62aa66f8532b8eb44e882596010b33e7781b0754. Change-Id: Ife659c28d621596ad288999fa128dcf32fc0b1c7 --- runtime/arch/x86/quick_entrypoints_x86.S | 1 + 1 file changed, 1 insertion(+) diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S index 337e5fe89..4155b7eef 100644 --- a/runtime/arch/x86/quick_entrypoints_x86.S +++ b/runtime/arch/x86/quick_entrypoints_x86.S @@ -1255,6 +1255,7 @@ DEFINE_FUNCTION art_quick_instrumentation_entry 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. -- 2.11.0