commit 3d1e0c971a5022cf3f7d02a45fdfd3381d5a8f3b
author Andreas Gampe <agampe@google.com> Fri Jul 10 23:51:03 2015 -0700
committer Andreas Gampe <agampe@google.com> Fri Jul 10 23:51:03 2015 -0700
tree eadd2e8eb6bdcd900e60f400973de7acd5163839
parent f470eb88cc3d3654f0fb1ca38622fa3a35fbd8a3

ART: Fix arm32 assembly stub CFI

Follow-up to 7ea6a170486d81b127e69673cd1020c4db628c93.

Change-Id: Ib6df28653374994c78cd5586f2381d36b74ca846

runtime/arch/arm/quick_entrypoints_arm.S

diff --git a/runtime/arch/arm/quick_entrypoints_arm.S b/runtime/arch/arm/quick_entrypoints_arm.S
index ca3ca1d..a7826a7 100644
--- a/runtime/arch/arm/quick_entrypoints_arm.S
+++ b/runtime/arch/arm/quick_entrypoints_arm.S
@@ -331,9 +331,7 @@
     SETUP_REFS_AND_ARGS_CALLEE_SAVE_FRAME r2, r3  @ save callee saves in case allocation triggers GC
     mov    r2, r9                         @ pass Thread::Current
     mov    r3, sp
-    .cfi_adjust_cfa_offset 16
     bl     \cxx_name                      @ (method_idx, this, caller, Thread*, SP)
-    .cfi_adjust_cfa_offset -16
     mov    r12, r1                        @ save Method*->code_
     RESTORE_REFS_AND_ARGS_CALLEE_SAVE_FRAME
     cbz    r0, 1f                         @ did we find the target? if not go to exception delivery