[AArch64] Fix CFA adjustment on dynamic linker entry.

diff --git a/ports/ChangeLog.aarch64 b/ports/ChangeLog.aarch64
index f86b796..db6aa4e 100644 (file)
--- 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.
+
 2014-01-06  Mike Frysinger  <vapier@gentoo.org>
 
        * sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h (ptrace_peeksiginfo_args):

diff --git a/ports/sysdeps/aarch64/dl-trampoline.S b/ports/sysdeps/aarch64/dl-trampoline.S
index c007165..2037f18 100644 (file)
--- 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)