From patchwork Tue Jun 11 07:29:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 17788 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f198.google.com (mail-ve0-f198.google.com [209.85.128.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D1BEC25DFB for ; Tue, 11 Jun 2013 07:29:08 +0000 (UTC) Received: by mail-ve0-f198.google.com with SMTP id jz10sf8137766veb.9 for ; Tue, 11 Jun 2013 00:29:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to:message-id :date:from:user-agent:mime-version:to:cc:subject:x-gm-message-state :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-google-group-id:list-post:list-help :list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=5ewAuXBx1SogmNXjvf0GM80SOmXGwbHWyC8Pz+Ss5IA=; b=BsV1GZB/UsYT1ecsukpjJJN6vWBaxpvgitBvXeZCyVa2Bk/O0VvJNC8A67c8pITtxD 9sTRAACYWZfjyxz6iQCX9d7GM3qLFD8Nqz5IhSNT6Fug95uWnMnrxl+3f9fV9negiyP4 dS3v0+qkNWrODw0PKY2hJVhSWDehtQIxnhTYd+P4CYP2CKsUz0D1hqQ6Oc0pgp8Ema9h tswIT72AVYQtfF/2czouNRl2rFNho1bqRE5nnsGd/7ucSf2gEjFWF/rjmmQOHmvtZ/ct XovXL/vXKfkvimk0PQiisye3F0mmdwg8Iea696VW/F7r1va55z5dpGbqMEdtwPE9yHsR OZMQ== X-Received: by 10.224.174.145 with SMTP id t17mr10286676qaz.4.1370935748215; Tue, 11 Jun 2013 00:29:08 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.122.102 with SMTP id lr6ls1987669qeb.13.gmail; Tue, 11 Jun 2013 00:29:08 -0700 (PDT) X-Received: by 10.52.164.163 with SMTP id yr3mr6372532vdb.76.1370935747982; Tue, 11 Jun 2013 00:29:07 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id ef7si6514272vdc.46.2013.06.11.00.29.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Jun 2013 00:29:07 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id gf11so3089816vcb.11 for ; Tue, 11 Jun 2013 00:29:07 -0700 (PDT) X-Received: by 10.52.36.115 with SMTP id p19mr6429461vdj.8.1370935747832; Tue, 11 Jun 2013 00:29:07 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.10.206 with SMTP id pb14csp98045vcb; Tue, 11 Jun 2013 00:29:06 -0700 (PDT) X-Received: by 10.15.10.197 with SMTP id g45mr14905127eet.132.1370935745676; Tue, 11 Jun 2013 00:29:05 -0700 (PDT) Received: from mail-ea0-x22e.google.com (mail-ea0-x22e.google.com [2a00:1450:4013:c01::22e]) by mx.google.com with ESMTPS id n44si10738260eeu.211.2013.06.11.00.29.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Jun 2013 00:29:05 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:4013:c01::22e is neither permitted nor denied by best guess record for domain of will.newton@linaro.org) client-ip=2a00:1450:4013:c01::22e; Received: by mail-ea0-f174.google.com with SMTP id o10so2863967eaj.33 for ; Tue, 11 Jun 2013 00:29:05 -0700 (PDT) X-Received: by 10.14.94.3 with SMTP id m3mr14813130eef.66.1370935744960; Tue, 11 Jun 2013 00:29:04 -0700 (PDT) Received: from localhost.localdomain (cpc11-seac20-2-0-cust84.7-2.cable.virginmedia.com. [81.108.156.85]) by mx.google.com with ESMTPSA id p43sm28386452eem.11.2013.06.11.00.29.03 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 11 Jun 2013 00:29:04 -0700 (PDT) Message-ID: <51B6D1BE.6050306@linaro.org> Date: Tue, 11 Jun 2013 08:29:02 +0100 From: Will Newton User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130514 Thunderbird/17.0.6 MIME-Version: 1.0 To: binutils@sourceware.org CC: patches@linaro.org Subject: [PATCH] bfd/elf64-aarch64.c: Use ELF64_R_SYM instead of ELF32_R_SYM. X-Gm-Message-State: ALoCoQnk1eX4ERlmnVEhfb++SQZSK2QGrjAHchROlaKkNZcAIknmDM4SFrkgwwdQoSh0oqYhlc6Y X-Original-Sender: will.newton@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Fix incorrect usage of ELF32_R_SYM introduced in ifunc changes. bfd/ChangeLog: 2013-06-11 Will Newton * elf64-aarch64.c (elf_aarch64_get_local_sym_hash): Use ELF64_R_SYM instead of ELF32_R_SYM. --- bfd/elf64-aarch64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bfd/elf64-aarch64.c b/bfd/elf64-aarch64.c index 5f1b700..19e18b4 100644 --- a/bfd/elf64-aarch64.c +++ b/bfd/elf64-aarch64.c @@ -2033,11 +2033,11 @@ elf_aarch64_get_local_sym_hash (struct elf64_aarch64_link_hash_table *htab, struct elf64_aarch64_link_hash_entry e, *ret; asection *sec = abfd->sections; hashval_t h = ELF_LOCAL_SYMBOL_HASH (sec->id, - ELF32_R_SYM (rel->r_info)); + ELF64_R_SYM (rel->r_info)); void **slot; e.root.indx = sec->id; - e.root.dynstr_index = ELF32_R_SYM (rel->r_info); + e.root.dynstr_index = ELF64_R_SYM (rel->r_info); slot = htab_find_slot_with_hash (htab->loc_hash_table, &e, h, create ? INSERT : NO_INSERT); @@ -2057,7 +2057,7 @@ elf_aarch64_get_local_sym_hash (struct elf64_aarch64_link_hash_table *htab, { memset (ret, 0, sizeof (*ret)); ret->root.indx = sec->id; - ret->root.dynstr_index = ELF32_R_SYM (rel->r_info); + ret->root.dynstr_index = ELF64_R_SYM (rel->r_info); ret->root.dynindx = -1; *slot = ret; }