aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Shawcroft <marcus.shawcroft@linaro.org>2014-01-07 10:12:35 +0000
committerMarcus Shawcroft <marcus.shawcroft@linaro.org>2014-01-07 10:31:04 +0000
commita244697f97107af77f26eb7e4dfc4538c7e68b27 (patch)
treeab0d32ad94b2df42270346db3482b5d31de771e4
parent8b43a2274a593ce91e673db1cfac6e808134bc84 (diff)
downloadtermbaud-a244697f97107af77f26eb7e4dfc4538c7e68b27.tar.gz
termbaud-a244697f97107af77f26eb7e4dfc4538c7e68b27.tar.xz
termbaud-a244697f97107af77f26eb7e4dfc4538c7e68b27.zip
[AArch64] Fix CFA adjustment on dynamic linker entry.
-rw-r--r--ports/ChangeLog.aarch645
-rw-r--r--ports/sysdeps/aarch64/dl-trampoline.S2
2 files changed, 6 insertions, 1 deletions
diff --git a/ports/ChangeLog.aarch64 b/ports/ChangeLog.aarch64
index dbb330bc9cb..89cc504fe45 100644
--- a/ports/ChangeLog.aarch64
+++ b/ports/ChangeLog.aarch64
@@ -1,3 +1,8 @@
+2014-01-07 Marcus Shawcroft <marcus.shawcroft@linaro.org>
+
+ * sysdeps/aarch64/dl-trampoline.S (_dl_runtime_resolve): Correct
+ cfi_adjust_cfa_offset offset.
+
2013-12-18 Marcus Shawcroft <marcus.shawcroft@linaro.org>
[BZ #15128]
diff --git a/ports/sysdeps/aarch64/dl-trampoline.S b/ports/sysdeps/aarch64/dl-trampoline.S
index 923ca76afc1..fc5ec83424b 100644
--- a/ports/sysdeps/aarch64/dl-trampoline.S
+++ b/ports/sysdeps/aarch64/dl-trampoline.S
@@ -42,7 +42,7 @@ _dl_runtime_resolve:
/* Save arguments. */
stp x8, x9, [sp, #-(80+8*16)]!
- cfi_adjust_cfa_offset (80)
+ cfi_adjust_cfa_offset (80+8*16)
cfi_rel_offset (x8, 0)
cfi_rel_offset (x9, 8)