From patchwork Tue Nov 18 16:43:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 3790 Received: (qmail 24081 invoked by alias); 18 Nov 2014 16:43:48 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 24007 invoked by uid 89); 18 Nov 2014 16:43:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-ee0-f43.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=eSXsyQ5bTSKBM2JeHWug7HPYgUK0KcDeDVLyfgSkwBo=; b=YPfkxR9bVxsbIbfo5Qmybm+zEANNc+LvG/1Y+VYKhqeP8qQG6MLg2znfXsmaQhK/up zMTtzhjI/S6RoS6lZ5VHBZyxeAGGgdD6A2IbcqUCweIOtUzIdfhxqxA4BldCViPttAA4 7QI6IEet49ebfOw3zjSZsV3tM7ebrT6vIzyUQrHEDfTPQgjec+4HiEfitJfyLk6PGgX8 4dp6qCxvP10r1tTu4sr3OT2+jJg/BdFd/woHvljZ2I7k7ffNVF+MHCHFcY+kTabW9u94 l5IAs6/RN0fQYq2+5e8QzzW/7LQdKYEvLxk7/639f4AZESes1IkcftzHPVI6qp1tn7Bv YSQg== X-Gm-Message-State: ALoCoQllycORuKMFnxd0ibRTESikdv4hZseN/EtFPIC5aDqvJAfcAZSA987WZxCJeJSLj8lwOneG X-Received: by 10.194.22.71 with SMTP id b7mr3947739wjf.46.1416329018268; Tue, 18 Nov 2014 08:43:38 -0800 (PST) From: Will Newton To: libc-alpha@sourceware.org Subject: [PATCH 2/3] AArch64: Use ELF macros rather than Elf64 throughout Date: Tue, 18 Nov 2014 16:43:29 +0000 Message-Id: <1416329010-8683-3-git-send-email-will.newton@linaro.org> In-Reply-To: <1416329010-8683-1-git-send-email-will.newton@linaro.org> References: <1416329010-8683-1-git-send-email-will.newton@linaro.org> Using the macros for ELF types is required for adding ILP32 support. In the standard AArch64 configuration this makes no difference to the types used. ChangeLog: 2014-11-18 Will Newton Andrew Pinski * sysdeps/aarch64/bits/link.h (la_aarch64_gnu_pltenter): Use ElfW macro instead of hardcoded Elf64 types. (la_aarch64_gnu_pltenter): Likewise. * sysdeps/aarch64/dl-machine.h (elf_machine_runtime_setup): Use ElfW(Addr). --- sysdeps/aarch64/bits/link.h | 6 +++--- sysdeps/aarch64/dl-machine.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sysdeps/aarch64/bits/link.h b/sysdeps/aarch64/bits/link.h index fe06827..3a84a18 100644 --- a/sysdeps/aarch64/bits/link.h +++ b/sysdeps/aarch64/bits/link.h @@ -40,8 +40,8 @@ typedef struct La_aarch64_retval } La_aarch64_retval; __BEGIN_DECLS -extern Elf64_Addr -la_aarch64_gnu_pltenter (Elf64_Sym *__sym, unsigned int __ndx, +extern ElfW(Addr) +la_aarch64_gnu_pltenter (ElfW(Sym) *__sym, unsigned int __ndx, uintptr_t *__refcook, uintptr_t *__defcook, La_aarch64_regs *__regs, @@ -50,7 +50,7 @@ la_aarch64_gnu_pltenter (Elf64_Sym *__sym, unsigned int __ndx, long int *__framesizep); extern unsigned int -la_aarch64_gnu_pltexit (Elf64_Sym *__sym, unsigned int __ndx, +la_aarch64_gnu_pltexit (ElfW(Sym) *__sym, unsigned int __ndx, uintptr_t *__refcook, uintptr_t *__defcook, const La_aarch64_regs *__inregs, diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h index acb090d..7f5ce2b 100644 --- a/sysdeps/aarch64/dl-machine.h +++ b/sysdeps/aarch64/dl-machine.h @@ -113,8 +113,8 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) } if (l->l_info[ADDRIDX (DT_TLSDESC_GOT)] && lazy) - *(Elf64_Addr*)(D_PTR (l, l_info[ADDRIDX (DT_TLSDESC_GOT)]) + l->l_addr) - = (Elf64_Addr) &_dl_tlsdesc_resolve_rela; + *(ElfW(Addr)*)(D_PTR (l, l_info[ADDRIDX (DT_TLSDESC_GOT)]) + l->l_addr) + = (ElfW(Addr)) &_dl_tlsdesc_resolve_rela; return lazy; }