From 62e2b91b9ae508a9f875fb7f15c2173dbbfa6f25 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 16 Feb 2018 09:32:56 -0800 Subject: [PATCH] i386: Update IFUNC tests for PLT address i386 generates 161: e8 ea ff ff ff call 150 <*ABS*@plt> instead of 1e1: e8 ea ff ff ff callq 1d0 <*ABS*+0x1e0@plt> * testsuite/ld-ifunc/ifunc-1-local-x86.d: Update PLT address for i386. * testsuite/ld-ifunc/ifunc-1-x86.d: Likewise. * testsuite/ld-ifunc/ifunc-3a-x86.d: Likewise. --- ld/ChangeLog | 6 ++++++ ld/testsuite/ld-ifunc/ifunc-1-local-x86.d | 2 +- ld/testsuite/ld-ifunc/ifunc-1-x86.d | 2 +- ld/testsuite/ld-ifunc/ifunc-3a-x86.d | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index b4ab0836521..ecebefca3af 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2018-02-16 H.J. Lu + + * testsuite/ld-ifunc/ifunc-1-local-x86.d: Updated for i386. + * testsuite/ld-ifunc/ifunc-1-x86.d: Likewise. + * testsuite/ld-ifunc/ifunc-3a-x86.d: Likewise. + 2018-02-16 H.J. Lu * testsuite/ld-ifunc/ifunc-1-local-x86.d: Updated. diff --git a/ld/testsuite/ld-ifunc/ifunc-1-local-x86.d b/ld/testsuite/ld-ifunc/ifunc-1-local-x86.d index 2459add9d7c..3c785d9fb30 100644 --- a/ld/testsuite/ld-ifunc/ifunc-1-local-x86.d +++ b/ld/testsuite/ld-ifunc/ifunc-1-local-x86.d @@ -4,5 +4,5 @@ #map: ifunc-1-local-x86.map #... -[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*\+0x[0-9a-f]+@plt> +[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*(\+0x[0-9a-f]+|)@plt> #pass diff --git a/ld/testsuite/ld-ifunc/ifunc-1-x86.d b/ld/testsuite/ld-ifunc/ifunc-1-x86.d index 54fcac31a8f..4c5bb8d5947 100644 --- a/ld/testsuite/ld-ifunc/ifunc-1-x86.d +++ b/ld/testsuite/ld-ifunc/ifunc-1-x86.d @@ -4,5 +4,5 @@ #map: ifunc-1-x86.map #... -[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*\+0x[0-9a-f]+@plt> +[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*(\+0x[0-9a-f]+|)@plt> #pass diff --git a/ld/testsuite/ld-ifunc/ifunc-3a-x86.d b/ld/testsuite/ld-ifunc/ifunc-3a-x86.d index 400d07af5bb..4954d65808f 100644 --- a/ld/testsuite/ld-ifunc/ifunc-3a-x86.d +++ b/ld/testsuite/ld-ifunc/ifunc-3a-x86.d @@ -4,5 +4,5 @@ #target: x86_64-*-* i?86-*-* #... -[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*\+0x[0-9a-f]+@plt> +[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*(\+0x[0-9a-f]+|)@plt> #pass -- 2.30.2