[PATCH 1/6] aarch64: Merge rtld_errno offset with memory reference

[Marcus Shawcroft]

On 20 May 2014 21:56, Richard Henderson <rth@twiddle.net> wrote:
> From: Richard Henderson <rth@redhat.com>
>
>         * sysdeps/unix/sysv/linux/aarch64/sysdep.h [RTLD_PRIVATE_ERRNO]
>         (SYSCALL_ERROR_HANDLER): Fold add insn into str offset.
> ---
>  sysdeps/unix/sysv/linux/aarch64/sysdep.h | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
> index d90ef25..8397ad3 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
> --
> 1.9.0
>

This is fine. Thanks /Marcus