From patchwork Mon Apr 29 15:56:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 16507 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E068325E08 for ; Mon, 29 Apr 2013 15:56:42 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id bs12sf3500466qab.2 for ; Mon, 29 Apr 2013 08:56:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :x-received: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=xMkRqLL6KZa+zwErKOgHt+vKbzVzLW83bwo+YaRSd4o=; b=KPbWZIR1Sh7jRBH3EgdLucBfyJDXCxKDBj6myCUv9gjf+VsIpBamTbDcDnjcc1JHG9 q9Eq16y3xT/uNiVp6lRMMdklAkOxpiaM1QuXVjDW00Voxfj6Iw3iHeq8eOFjFa/K1IXw r0ydRSCNqhUHnbJnTq72zOxmW+yc3J+ozll3BWK7NtANIyRTBNnsP4PrfkXR9KANNI3B vrjpyVG/EjgK+7VNsPFhPoMYZkiJcVzY4VhRKP7XRqh/rYVJ9/7Yv+3izA26mXz8xwzd lzbLt0LXWIV9w9K+EOuiRA1z/Z2atI8YmyRXvdQb5yFMI0ki8LoVsORTq+01n0wGcknm D1QQ== X-Received: by 10.236.41.137 with SMTP id h9mr23932240yhb.43.1367251002136; Mon, 29 Apr 2013 08:56:42 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.37.33 with SMTP id v1ls2658239qej.76.gmail; Mon, 29 Apr 2013 08:56:41 -0700 (PDT) X-Received: by 10.220.91.17 with SMTP id k17mr33569791vcm.36.1367251001837; Mon, 29 Apr 2013 08:56:41 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id ir6si10057352vdb.13.2013.04.29.08.56.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 29 Apr 2013 08:56:41 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.176 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.176; Received: by mail-vc0-f176.google.com with SMTP id ib11so1382146vcb.21 for ; Mon, 29 Apr 2013 08:56:41 -0700 (PDT) X-Received: by 10.221.0.199 with SMTP id nn7mr33691654vcb.14.1367251001691; Mon, 29 Apr 2013 08:56:41 -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.58.127.98 with SMTP id nf2csp63922veb; Mon, 29 Apr 2013 08:56:40 -0700 (PDT) X-Received: by 10.180.73.173 with SMTP id m13mr18730651wiv.27.1367251000381; Mon, 29 Apr 2013 08:56:40 -0700 (PDT) Received: from mail-ee0-f45.google.com (mail-ee0-f45.google.com [74.125.83.45]) by mx.google.com with ESMTPS id v4si33153003eel.197.2013.04.29.08.56.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 29 Apr 2013 08:56:40 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.45 is neither permitted nor denied by best guess record for domain of will.newton@linaro.org) client-ip=74.125.83.45; Received: by mail-ee0-f45.google.com with SMTP id l10so2673683eei.18 for ; Mon, 29 Apr 2013 08:56:39 -0700 (PDT) X-Received: by 10.14.194.70 with SMTP id l46mr77139206een.28.1367250999751; Mon, 29 Apr 2013 08:56:39 -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 m48sm26589985eeu.15.2013.04.29.08.56.38 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 29 Apr 2013 08:56:38 -0700 (PDT) Message-ID: <517E9835.9030706@linaro.org> Date: Mon, 29 Apr 2013 16:56:37 +0100 From: Will Newton User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130402 Thunderbird/17.0.5 MIME-Version: 1.0 To: binutils@sourceware.org CC: patches@linaro.org Subject: [PATCH] ld/testsuite/ld-arm: Fix ifunc-17 failure with arm-eabi. X-Gm-Message-State: ALoCoQkGByoBzKeAo9FYF/xEQYhIndMtL4qbMjf+loaSrgUjagTayThP/xSkG6W0MothnepT0UKP X-Original-Sender: will.newton@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.176 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: , ld/testsuite/ChangeLog: 2013-04-29 Will Newton * ld-arm/arm-elf.exp: Use linker script for IFUNC test 17. * ld-arm/ifunc-17.dd: Update offsets for linker script. * ld-arm/ifunc-17.gd: Likewise. * ld-arm/ifunc-17.rd: Likewise. --- ld/testsuite/ld-arm/arm-elf.exp | 2 +- ld/testsuite/ld-arm/ifunc-17.dd | 22 +++++++++++----------- ld/testsuite/ld-arm/ifunc-17.gd | 8 ++++---- ld/testsuite/ld-arm/ifunc-17.rd | 6 +++--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp index c488e3c..a6abe82 100644 --- a/ld/testsuite/ld-arm/arm-elf.exp +++ b/ld/testsuite/ld-arm/arm-elf.exp @@ -451,7 +451,7 @@ set armelftests_nonacl { {objdump {-s -j.data -j.got} ifunc-16.gd} {readelf -r ifunc-16.rd}} "ifunc-16"} - {"IFUNC test 17" "" "" "" {ifunc-17.s} + {"IFUNC test 17" "-T ifunc-static.ld" "" "" {ifunc-17.s} {{objdump -d ifunc-17.dd} {objdump {-s -j.data -j.got} ifunc-17.gd} {readelf -r ifunc-17.rd}} diff --git a/ld/testsuite/ld-arm/ifunc-17.dd b/ld/testsuite/ld-arm/ifunc-17.dd index f23a249..ee5cd05 100644 --- a/ld/testsuite/ld-arm/ifunc-17.dd +++ b/ld/testsuite/ld-arm/ifunc-17.dd @@ -4,22 +4,22 @@ Disassembly of section \.iplt: -00008084 <.iplt>: +00009000 <.iplt>: #------------------------------------------------------------------------------ #------ appfunc1's .iplt entry #------------------------------------------------------------------------------ - 8084: e28fc600 add ip, pc, #0, 12 - 8088: e28cca08 add ip, ip, #8, 20 ; 0x8000 - 808c: e5bcf01c ldr pc, \[ip, #28\]! + 9000: e28fc600 add ip, pc, #0, 12 + 9004: e28cca08 add ip, ip, #8, 20 ; 0x8000 + 9008: e5bcf004 ldr pc, \[ip, #4\]! Disassembly of section \.text: -00008090 : - 8090: 46f7 mov pc, lr +0000a000 : + a000: 46f7 mov pc, lr -00008092 : - 8092: 46f7 mov pc, lr +0000a002 : + a002: 46f7 mov pc, lr -00008094 <_start>: - 8094: f7ff eff6 blx 8084 - 8098: 00000010 \.word 0x00000010 +0000a004 <_start>: + a004: f7fe effc blx 9000 + a008: 00000010 \.word 0x00000010 diff --git a/ld/testsuite/ld-arm/ifunc-17.gd b/ld/testsuite/ld-arm/ifunc-17.gd index 4a12eb8..dadfc9e 100644 --- a/ld/testsuite/ld-arm/ifunc-17.gd +++ b/ld/testsuite/ld-arm/ifunc-17.gd @@ -3,8 +3,8 @@ Contents of section \.got: #------------------------------------------------------------------------------ -#------ 000100a8: 0x8091 (appfunc1) -#------ 000100ac: 0x8093 (appfunc2) +#------ 0001100c: 0xa001 (appfunc1) +#------ 00011010: 0xa003 (appfunc2) #------------------------------------------------------------------------------ - 1009c 00000000 00000000 00000000 91800000 .* - 100ac 93800000 .* + 11000 00000000 00000000 00000000 01a00000 .* + 11010 03a00000 .* diff --git a/ld/testsuite/ld-arm/ifunc-17.rd b/ld/testsuite/ld-arm/ifunc-17.rd index a93fd64..b167f45 100644 --- a/ld/testsuite/ld-arm/ifunc-17.rd +++ b/ld/testsuite/ld-arm/ifunc-17.rd @@ -1,5 +1,5 @@ -Relocation section '\.rel\.dyn' at offset 0x74 contains 2 entries: +Relocation section '\.rel\.dyn' at offset 0x8000 contains 2 entries: Offset Info Type Sym\.Value Sym\. Name -000100a8 ......a0 R_ARM_IRELATIVE -000100ac ......a0 R_ARM_IRELATIVE +0001100c ......a0 R_ARM_IRELATIVE +00011010 ......a0 R_ARM_IRELATIVE