public inbox for libc-ports@sourceware.org
 help / color / mirror / Atom feed
From: Marcus Shawcroft <marcus.shawcroft@linaro.org>
To: libc-ports@sourceware.org
Cc: Marcus Shawcroft <marcus.shawcroft@linaro.org>
Subject: [PATCH, COMMITTED] [AArch64] Fix CFA adjustment on dynamic linker entry.
Date: Tue, 07 Jan 2014 10:17:00 -0000	[thread overview]
Message-ID: <1389089813-3164-1-git-send-email-marcus.shawcroft@linaro.org> (raw)

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

                 reply	other threads:[~2014-01-07 10:17 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1389089813-3164-1-git-send-email-marcus.shawcroft@linaro.org \
    --to=marcus.shawcroft@linaro.org \
    --cc=libc-ports@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).