summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sebastien Hertz <shertz@google.com> 2015-05-06 08:07:06 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2015-05-06 08:07:07 +0000
commit644fa22a432ad0f717878331e745d6c25cc57d5d (patch)
tree1749cfc49c8e6e9e65bafb2f74dae17e3782ed3d
parent3acc27f454e33f4650867a3ba0ecb8d3011e1048 (diff)
parent27a4a9d2a488dd57cd00d9108d10defde04141a2 (diff)
Merge "Fix instrumentation exit stub for arm64"
-rw-r--r--runtime/arch/arm64/quick_entrypoints_arm64.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/arch/arm64/quick_entrypoints_arm64.S b/runtime/arch/arm64/quick_entrypoints_arm64.S
index 1d316fcea5..f8b0734428 100644
--- a/runtime/arch/arm64/quick_entrypoints_arm64.S
+++ b/runtime/arch/arm64/quick_entrypoints_arm64.S
@@ -182,7 +182,7 @@
// Restore xSELF as it might be scratched.
mov xSELF, xETR
// ETR
- ldr xETR, [sp, #16]
+ ldr xETR, [sp, #32]
.cfi_restore x21
add sp, sp, #112