about summary refs log tree commit diff
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:29:18 +0000
commitb513cbf751bc891f5f9dce96fba4a5b295f8f840 (patch)
tree1511933f74a6c4e1f46ebeeececfacbd0da6e141
parent87ded0c382b835e5d7ca8b5e059a8a044a6c3976 (diff)
downloadglibc-b513cbf751bc891f5f9dce96fba4a5b295f8f840.tar.gz
glibc-b513cbf751bc891f5f9dce96fba4a5b295f8f840.tar.xz
glibc-b513cbf751bc891f5f9dce96fba4a5b295f8f840.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 f86b79640c..db6aa4ec1e 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.
+
 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 c007165ad5..2037f18276 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)