From: Marcus Shawcroft Date: Tue, 7 Jan 2014 10:12:35 +0000 (+0000) Subject: [AArch64] Fix CFA adjustment on dynamic linker entry. X-Git-Tag: glibc-2.19~146 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b513cbf751bc891f5f9dce96fba4a5b295f8f840;p=thirdparty%2Fglibc.git [AArch64] Fix CFA adjustment on dynamic linker entry. --- diff --git a/ports/ChangeLog.aarch64 b/ports/ChangeLog.aarch64 index f86b79640ca..db6aa4ec1e1 100644 --- a/ports/ChangeLog.aarch64 +++ b/ports/ChangeLog.aarch64 @@ -1,3 +1,8 @@ +2014-01-07 Marcus Shawcroft + + * sysdeps/aarch64/dl-trampoline.S (_dl_runtime_resolve): Correct + cfi_adjust_cfa_offset offset. + 2014-01-06 Mike Frysinger * 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 c007165ad5c..2037f182768 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)