From 3612eb8f25d978e7e4ac536a34098091f737161c Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Wed, 21 May 2014 11:36:03 -0400 Subject: aarch64: Merge rtld_errno offset with memory reference --- ChangeLog | 5 +++++ sysdeps/unix/sysv/linux/aarch64/sysdep.h | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f49fbbf70..4f0414ef0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-05-21 Richard Henderson + + * sysdeps/unix/sysv/linux/aarch64/sysdep.h [RTLD_PRIVATE_ERRNO] + (SYSCALL_ERROR_HANDLER): Fold add insn into str offset. + 2014-05-20 Joseph Myers * sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h index d90ef25bc4..8397ad30a9 100644 --- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h +++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h @@ -117,9 +117,8 @@ # define SYSCALL_ERROR_HANDLER \ __local_syscall_error: \ adrp x1, C_SYMBOL_NAME(rtld_errno); \ - add x1, x1, #:lo12:C_SYMBOL_NAME(rtld_errno); \ neg w0, w0; \ - str w0, [x1]; \ + str w0, [x1, :lo12:C_SYMBOL_NAME(rtld_errno)]; \ mov x0, -1; \ RET; # else -- cgit v1.2.3-70-g09d2