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: 41049 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 72CF3241C9 for ; Tue, 18 Nov 2014 16:44:42 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id l18sf2126818wgh.6 for ; Tue, 18 Nov 2014 08:44:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:mailing-list :precedence:list-id:list-unsubscribe:list-subscribe:list-archive :list-post:list-help:sender:delivered-to:from:to:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results; bh=eSXsyQ5bTSKBM2JeHWug7HPYgUK0KcDeDVLyfgSkwBo=; b=kkmZee6zBYK8g95zv+0GdznhWgkrX5SGID53Y3YDg1xF2Gpa6YNmoaRv+bpk7V01Xu tPE8OR/vv3u5bfYm7WBsjM5b0T5fnfXolJxYpgDy9QLkGV2uHYl08F1Z5Xug6CaW58NY WxGOuMBu0n1Av0i5MCYDJXOXH4TB0iMBF2B4HgrAILzpo6kjQn3ViF3hvF7ydCTI7gKx ABzd25nbwcN1nFbii7u9BAAfirgRJ6VSvsNmcfqq5eZFP5wyku3HARWxFiVVEiJoU8ks lvvr5qAjZ4DizeI67eUDiBIrxPhXcFu0UIa2orQoHrLNlu2OwMXwcYK65eO1jG9cAB6g 6r/A== X-Gm-Message-State: ALoCoQmzomD0a6u+7gpCzkAJgOWbigvobVdEIqMQm5R3TarLE+wTTRR5vMhmIleHyOLCJSshmBWF X-Received: by 10.194.133.39 with SMTP id oz7mr2948895wjb.3.1416329081701; Tue, 18 Nov 2014 08:44:41 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.101.161 with SMTP id fh1ls1094860wib.22.gmail; Tue, 18 Nov 2014 08:44:41 -0800 (PST) X-Received: by 10.194.239.164 with SMTP id vt4mr5093675wjc.131.1416329081594; Tue, 18 Nov 2014 08:44:41 -0800 (PST) Received: from mail-wg0-x236.google.com (mail-wg0-x236.google.com. [2a00:1450:400c:c00::236]) by mx.google.com with ESMTPS id df5si109820wib.0.2014.11.18.08.44.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Nov 2014 08:44:41 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:400c:c00::236 as permitted sender) client-ip=2a00:1450:400c:c00::236; Received: by mail-wg0-f54.google.com with SMTP id y10so6666754wgg.13 for ; Tue, 18 Nov 2014 08:44:41 -0800 (PST) X-Received: by 10.180.19.193 with SMTP id h1mr2289479wie.10.1416329081364; Tue, 18 Nov 2014 08:44:41 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp1360045lbc; Tue, 18 Nov 2014 08:44:39 -0800 (PST) X-Received: by 10.70.53.102 with SMTP id a6mr28672834pdp.70.1416329079073; Tue, 18 Nov 2014 08:44:39 -0800 (PST) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id so2si38544449pab.132.2014.11.18.08.44.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Nov 2014 08:44:39 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-54483-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 24081 invoked by alias); 18 Nov 2014 16:43:48 -0000 Mailing-List: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Precedence: list 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 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-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> X-Original-Sender: will.newton@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:400c:c00::236 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@sourceware.org X-Google-Group-Id: 836684582541 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; }