aarch64: Merge rtld_errno offset with memory reference

diff --git a/ChangeLog b/ChangeLog
index 7f49fbbf70acd32ca36ff0242df8318de2fe61fe..4f0414ef0af869b2dac7a4d24bb82ae1947cffa6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-21  Richard Henderson  <rth@redhat.com>
+
+       * sysdeps/unix/sysv/linux/aarch64/sysdep.h [RTLD_PRIVATE_ERRNO]
+       (SYSCALL_ERROR_HANDLER): Fold add insn into str offset.
+
 2014-05-20  Joseph Myers  <joseph@codesourcery.com>
 
        * 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 d90ef25bc4ae338a0e2f7308760f1fa5d89ec73e..8397ad30a993c64d0434216860ce125dc1fc9418 100644 (file)
--- 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