[LD,AArch64] Fix ifunc testisms

Message ID 5B4DD94C.3090708@arm.com
State New
Headers show
Series
  • [LD,AArch64] Fix ifunc testisms
Related show

Commit Message

Andre Vieira (lists) July 17, 2018, 11:55 a.m.
Hi all,

This patch fixes some ifunc testisms after H.J. Lu's patch to enable the
use of IFUNC pointers in position dependent code for binutils. See PR
LD/23169 in binutils bugzilla.

The aarch64 ifunc error message test was changed to no longer expect
this error message as this is now an accepted combination. This patch
also disables the executable tests added by H.J. Lu for aarch64, just as
Alan Modra did with his patch, as these tests only seem to work on some
architectures.

Tested for aarch64-none-linux-gnu.

Is this OK for trunk?

ld/ChangeLog:
2018-07-17  Andre Vieira  <andre.simoesdiasvieira@arm.com>

        * testsuite/ld-aarch64/ifunc-9.d: Remove no longer expected error.
        * testsuite/ld-ifunc/ifunc.exp: Disable tests for aarch64.

Comments

Nick Clifton July 17, 2018, 4:15 p.m. | #1
Hi Andre,

> ld/ChangeLog:

> 2018-07-17  Andre Vieira  <andre.simoesdiasvieira@arm.com>

> 

>         * testsuite/ld-aarch64/ifunc-9.d: Remove no longer expected error.

>         * testsuite/ld-ifunc/ifunc.exp: Disable tests for aarch64.


Approved for trunk - please apply.

Cheers
  Nick
Andre Vieira (lists) July 19, 2018, 3:24 p.m. | #2
Hi Nick,

Could I get write-after-approval permissions on binutils?

For some reason I thought I might already have it, but git is telling me otherwise.

Kind Regards,
Andre

________________________________________
From: Nick Clifton <nickc@redhat.com>

Sent: Tuesday, July 17, 2018 5:15:58 PM
To: Andre Simoes Dias Vieira; binutils@sourceware.org
Subject: Re: [PATCH, LD, AArch64] Fix ifunc testisms

Hi Andre,

> ld/ChangeLog:

> 2018-07-17  Andre Vieira  <andre.simoesdiasvieira@arm.com>

>

>         * testsuite/ld-aarch64/ifunc-9.d: Remove no longer expected error.

>         * testsuite/ld-ifunc/ifunc.exp: Disable tests for aarch64.


Approved for trunk - please apply.

Cheers
  Nick
Nick Clifton July 20, 2018, 7:27 a.m. | #3
Hi Andre,

> Could I get write-after-approval permissions on binutils?


Certainly.  Please use the form here: https://sourceware.org/cgi-bin/pdw/ps_form.cgi

You can use my email address as the approver.

Cheers
  Nick

Patch

diff --git a/ld/testsuite/ld-aarch64/ifunc-9.d b/ld/testsuite/ld-aarch64/ifunc-9.d
index 3b4e99525429c9b42e2b0965d56ed2f2b5847056..e921591275f3ed45235d8e34b8786da4e1bf5595 100644
--- a/ld/testsuite/ld-aarch64/ifunc-9.d
+++ b/ld/testsuite/ld-aarch64/ifunc-9.d
@@ -1,3 +1,4 @@ 
 #ld: --export-dynamic
-#error: .*dynamic STT_GNU_IFUNC symbol `foo' with pointer equality in `.*.o' can not be used when making an executable; recompile with -fPIE and relink with -pie
+#objdump: -dr
 #target: aarch64*-*-*
+#...
diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp
index 612d91402fdd4e1e04d19fc57a1d4571da45dc22..86892b96b58942516935a09fc76d734547f01a9a 100644
--- a/ld/testsuite/ld-ifunc/ifunc.exp
+++ b/ld/testsuite/ld-ifunc/ifunc.exp
@@ -713,7 +713,7 @@  run_ld_link_exec_tests [list \
 # That does not happen for the pr23169 testcase where the resolver is
 # in the executable (which is relocated last by ld.so).
 if { [isnative]
-     && ![istarget "powerpc-*-*"] } {
+     && !([istarget "powerpc-*-*"] || [istarget "aarch64*-*-*"]) } {
 run_ld_link_exec_tests [list \
     [list \
 	"Run pr23169a" \