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.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index b4ab08365216a5da6eb43f54c7e714c078bc8614..ecebefca3afdfdeba6c04c33e7c139b9a98fb723 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * 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  <hongjiu.lu@intel.com>
 
        * 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 2459add9d7c6bb2b2cccae44675fbaa4b22614df..3c785d9fb304c9b16aa9eabd42dd693f85b071fc 100644 (file)
--- 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 54fcac31a8f56a1f3e2a74469a33173192588b04..4c5bb8d594771486ebaf8d5f27b29fd540956bb1 100644 (file)
--- 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 400d07af5bb4c8114729c1862ef8880bad446021..4954d65808f3e4e9bada57bb5415ad848a5a6182 100644 (file)
--- 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