This is the mail archive of the
libc-ports@sources.redhat.com
mailing list for the libc-ports project.
[PATCH, COMMITTED] [AArch64] Fix CFA adjustment on dynamic linker entry.
- From: Marcus Shawcroft <marcus dot shawcroft at linaro dot org>
- To: libc-ports at sourceware dot org
- Cc: Marcus Shawcroft <marcus dot shawcroft at linaro dot org>
- Date: Tue, 7 Jan 2014 10:16:53 +0000
- Subject: [PATCH, COMMITTED] [AArch64] Fix CFA adjustment on dynamic linker entry.
- Authentication-results: sourceware.org; auth=none
The patch https://sourceware.org/ml/libc-ports/2013-12/msg00028.html missed a CFA adjustment. Committed, backport to 2.18 shortly.
/Marcus
---
ports/ChangeLog.aarch64 | 5 +++++
ports/sysdeps/aarch64/dl-trampoline.S | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ports/ChangeLog.aarch64 b/ports/ChangeLog.aarch64
index e947cb1..05b2dbf 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-01 Marcus Shawcroft <marcus.shawcroft@linaro.org>
* sysdeps/aarch64/libm-test-ulps: Regenerated.
diff --git a/ports/sysdeps/aarch64/dl-trampoline.S b/ports/sysdeps/aarch64/dl-trampoline.S
index c007165..2037f18 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)
--
1.8.3.2