From: H.J. Lu <hjl.tools@gmail.com>
Date: Mon, 20 Jul 2020 11:53:58 +0000 (-0700)
Subject: x86: Update PR gas/26263 linker tests
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=98b3697bcdedb92739d8feb9b881efdd70fd40d3;p=binutils-gdb.git

x86: Update PR gas/26263 linker tests

Update and run PR gas/26263 linker tests for all x86 ELF targets to
accept any program header layout.

	PR gas/26263
	* testsuite/ld-i386/pr26263.d: Updated.
	* testsuite/ld-x86-64/pr26263.d: Likewise.
	* testsuite/ld-x86-64/x86-64.exp: Run gas/26263 test for all ELF
	targets.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 747856868ab..339fa785e28 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2020-07-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gas/26263
+	* testsuite/ld-i386/pr26263.d: Updated.
+	* testsuite/ld-x86-64/pr26263.d: Likewise.
+	* testsuite/ld-x86-64/x86-64.exp: Run gas/26263 test for all ELF
+	targets.
+
 2020-07-19  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR gas/26263
diff --git a/ld/testsuite/ld-i386/pr26263.d b/ld/testsuite/ld-i386/pr26263.d
index 8cf7c15a66c..e6874e25c34 100644
--- a/ld/testsuite/ld-i386/pr26263.d
+++ b/ld/testsuite/ld-i386/pr26263.d
@@ -8,12 +8,12 @@
 
 Disassembly of section .text:
 
-0+1000 <printk>:
+0+[a-f0-9]+ <printk>:
  +[a-f0-9]+:	c3                   	ret    
 
 Disassembly of section .init.text:
 
-0+1001 <foo>:
- +[a-f0-9]+:	e8 fa ff ff ff       	call   1000 <printk>
- +[a-f0-9]+:	e8 f5 ff ff ff       	call   1000 <printk>
+0+[a-f0-9]+ <foo>:
+ +[a-f0-9]+:	e8 ([0-9a-f]{2} ){4}      	call   [a-f0-9]+ <printk>
+ +[a-f0-9]+:	e8 ([0-9a-f]{2} ){4}      	call   [a-f0-9]+ <printk>
 #pass
diff --git a/ld/testsuite/ld-x86-64/pr26263.d b/ld/testsuite/ld-x86-64/pr26263.d
index 375218c3e9a..cdc43f231bd 100644
--- a/ld/testsuite/ld-x86-64/pr26263.d
+++ b/ld/testsuite/ld-x86-64/pr26263.d
@@ -7,12 +7,12 @@
 
 Disassembly of section .text:
 
-0+1000 <printk>:
+0+[a-f0-9]+ <printk>:
  +[a-f0-9]+:	c3                   	ret    
 
 Disassembly of section .init.text:
 
-0+1001 <foo>:
- +[a-f0-9]+:	e8 fa ff ff ff       	call   1000 <printk>
- +[a-f0-9]+:	e8 f5 ff ff ff       	call   1000 <printk>
+0+[a-f0-9]+ <foo>:
+ +[a-f0-9]+:	e8 ([0-9a-f]{2} ){4}      	call   [a-f0-9]+ <printk>
+ +[a-f0-9]+:	e8 ([0-9a-f]{2} ){4}      	call   [a-f0-9]+ <printk>
 #pass
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index 21aa6a06eff..d836f334963 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -431,6 +431,7 @@ run_dump_test "pr25416-2b"
 run_dump_test "pr25416-3"
 run_dump_test "pr25416-4"
 run_dump_test "pr26018"
+run_dump_test "pr26263"
 
 if ![istarget "x86_64-*-linux*"] {
     return
@@ -640,7 +641,6 @@ run_dump_test "pr20253-5b"
 run_dump_test "tlsdesc2"
 run_dump_test "pr22048"
 run_dump_test "pr22929"
-run_dump_test "pr26263"
 
 proc undefined_weak {cflags ldflags} {
     set testname "Undefined weak symbol"