Don't hard code expected output.

2010-07-13  H.J. Lu  <hongjiu.lu@intel.com>

	* ld-i386/hidden2.d: Don't hard code expected output.
	* ld-i386/protected3.d: Likewise.
	* ld-x86-64/hidden2.d: Likewise.
	* ld-x86-64/protected3.d: Likewise.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 6755523..a1f9e6b 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,12 @@
 2010-07-13  H.J. Lu  <hongjiu.lu@intel.com>
 
+       * ld-i386/hidden2.d: Don't hard code expected output.
+       * ld-i386/protected3.d: Likewise.
+       * ld-x86-64/hidden2.d: Likewise.
+       * ld-x86-64/protected3.d: Likewise.
+
+2010-07-13  H.J. Lu  <hongjiu.lu@intel.com>
+
        PR ld/11791
        * ld-ifunc/ifunc-10-i386.d: New.
        * ld-ifunc/ifunc-10-i386.s: Likewise.

diff --git a/ld/testsuite/ld-i386/hidden2.d b/ld/testsuite/ld-i386/hidden2.d
index 90bc438..0d800ce 100644 (file)
--- a/ld/testsuite/ld-i386/hidden2.d
+++ b/ld/testsuite/ld-i386/hidden2.d
@@ -8,6 +8,6 @@
 Disassembly of section .text:
 
 [a-f0-9]+ <bar>:
-[      ]*[a-f0-9]+:    e8 cf fe ff ff          call   0 <bar-0x[a-f0-9]+>
+[      ]*[a-f0-9]+:    e8 cf fe ff ff          call   0 .*
 [      ]*[a-f0-9]+:    c3                      ret    
 #pass

diff --git a/ld/testsuite/ld-i386/protected3.d b/ld/testsuite/ld-i386/protected3.d
index e42185a..aafa2d8 100644 (file)
--- a/ld/testsuite/ld-i386/protected3.d
+++ b/ld/testsuite/ld-i386/protected3.d
@@ -8,6 +8,6 @@
 Disassembly of section .text:
 
 0+[a-f0-9]+ <bar>:
-[      ]*[a-f0-9]+:    8b 81 0c 00 00 00       mov    0x[a-f0-9]+\(%ecx\),%eax
+[      ]*[a-f0-9]+:    8b 81 [a-f0-9][a-f0-9] [a-f0-9][a-f0-9] 00 00           mov    0x[a-f0-9]+\(%ecx\),%eax
 [      ]*[a-f0-9]+:    c3                      ret    
 #pass

diff --git a/ld/testsuite/ld-x86-64/hidden2.d b/ld/testsuite/ld-x86-64/hidden2.d
index 0d89e6e..9a29f9a 100644 (file)
--- a/ld/testsuite/ld-x86-64/hidden2.d
+++ b/ld/testsuite/ld-x86-64/hidden2.d
@@ -8,6 +8,6 @@
 Disassembly of section .text:
 
 [a-f0-9]+ <bar>:
-[      ]*[a-f0-9]+:    e8 33 fe ff ff          callq  0 <bar-0x[a-f0-9]+>
+[      ]*[a-f0-9]+:    e8 33 fe ff ff          callq  0 .*
 [      ]*[a-f0-9]+:    c3                      retq   
 #pass

diff --git a/ld/testsuite/ld-x86-64/protected3.d b/ld/testsuite/ld-x86-64/protected3.d
index 09556ce..897c1cf 100644 (file)
--- a/ld/testsuite/ld-x86-64/protected3.d
+++ b/ld/testsuite/ld-x86-64/protected3.d
@@ -8,6 +8,6 @@
 Disassembly of section .text:
 
 0+[a-f0-9]+ <bar>:
-[      ]*[a-f0-9]+:    8b 05 ce 00 20 00       mov    0x[a-f0-9]+\(%rip\),%eax        # [a-f0-9]+ <foo>
+[      ]*[a-f0-9]+:    8b 05 [a-f0-9][a-f0-9] 00 [a-f0-9][a-f0-9] 00           mov    0x[a-f0-9]+\(%rip\),%eax        # [a-f0-9]+ <foo>
 [      ]*[a-f0-9]+:    c3                      retq   
 #pass