projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 74d7f0a)
Update x86-64 no-PLT tests for x32
authorH.J. Lu <hjl.tools@gmail.com>
Sun, 12 Jun 2016 14:28:58 +0000 (07:28 -0700)
committerH.J. Lu <hjl.tools@gmail.com>
Sun, 12 Jun 2016 14:28:58 +0000 (07:28 -0700)
X32 has different output formats for readelf and objdump as well as a
different conversion of load symbol address via GOT.

* testsuite/ld-x86-64/libno-plt-1b.dd: Updated for x32.
* testsuite/ld-x86-64/libno-plt-1b.rd: Likewise.
* testsuite/ld-x86-64/no-plt-1a.dd: Likewise.
* testsuite/ld-x86-64/no-plt-1a.rd: Likewise.
* testsuite/ld-x86-64/no-plt-1b.dd: Likewise.
* testsuite/ld-x86-64/no-plt-1b.rd: Likewise.
* testsuite/ld-x86-64/no-plt-1c.dd: Likewise.
* testsuite/ld-x86-64/no-plt-1c.rd: Likewise.
* testsuite/ld-x86-64/no-plt-1d.dd: Likewise.
* testsuite/ld-x86-64/no-plt-1e.dd: Likewise.
* testsuite/ld-x86-64/no-plt-1e.rd: Likewise.
* testsuite/ld-x86-64/no-plt-1f.dd: Likewise.
* testsuite/ld-x86-64/no-plt-1f.rd: Likewise.
* testsuite/ld-x86-64/no-plt-1g.dd: Likewise.
* testsuite/ld-x86-64/no-plt-1g.rd: Likewise.

16 files changed:
ld/ChangeLog patch | blob | history
ld/testsuite/ld-x86-64/libno-plt-1b.dd patch | blob | history
ld/testsuite/ld-x86-64/libno-plt-1b.rd patch | blob | history
ld/testsuite/ld-x86-64/no-plt-1a.dd patch | blob | history
ld/testsuite/ld-x86-64/no-plt-1a.rd patch | blob | history
ld/testsuite/ld-x86-64/no-plt-1b.dd patch | blob | history
ld/testsuite/ld-x86-64/no-plt-1b.rd patch | blob | history
ld/testsuite/ld-x86-64/no-plt-1c.dd patch | blob | history
ld/testsuite/ld-x86-64/no-plt-1c.rd patch | blob | history
ld/testsuite/ld-x86-64/no-plt-1d.dd patch | blob | history
ld/testsuite/ld-x86-64/no-plt-1e.dd patch | blob | history
ld/testsuite/ld-x86-64/no-plt-1e.rd patch | blob | history
ld/testsuite/ld-x86-64/no-plt-1f.dd patch | blob | history
ld/testsuite/ld-x86-64/no-plt-1f.rd patch | blob | history
ld/testsuite/ld-x86-64/no-plt-1g.dd patch | blob | history
ld/testsuite/ld-x86-64/no-plt-1g.rd patch | blob | history

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 4a74c8f7aa27d879f32370510fa7f54a54a421bc..05f490ae92659b3eb9af9c4eee064d97ef6ac1ab 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,21 @@
+2016-06-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * testsuite/ld-x86-64/libno-plt-1b.dd: Updated for x32.
+       * testsuite/ld-x86-64/libno-plt-1b.rd: Likewise.
+       * testsuite/ld-x86-64/no-plt-1a.dd: Likewise.
+       * testsuite/ld-x86-64/no-plt-1a.rd: Likewise.
+       * testsuite/ld-x86-64/no-plt-1b.dd: Likewise.
+       * testsuite/ld-x86-64/no-plt-1b.rd: Likewise.
+       * testsuite/ld-x86-64/no-plt-1c.dd: Likewise.
+       * testsuite/ld-x86-64/no-plt-1c.rd: Likewise.
+       * testsuite/ld-x86-64/no-plt-1d.dd: Likewise.
+       * testsuite/ld-x86-64/no-plt-1e.dd: Likewise.
+       * testsuite/ld-x86-64/no-plt-1e.rd: Likewise.
+       * testsuite/ld-x86-64/no-plt-1f.dd: Likewise.
+       * testsuite/ld-x86-64/no-plt-1f.rd: Likewise.
+       * testsuite/ld-x86-64/no-plt-1g.dd: Likewise.
+       * testsuite/ld-x86-64/no-plt-1g.rd: Likewise.
+
 2016-06-11  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/20244
diff --git a/ld/testsuite/ld-x86-64/libno-plt-1b.dd b/ld/testsuite/ld-x86-64/libno-plt-1b.dd
index c58ede452e3691a9ee3a189de5f1417e0d5552df..2892ce4245087963c2a41c9b666615755fdc08cb 100644 (file)
--- a/ld/testsuite/ld-x86-64/libno-plt-1b.dd
+++ b/ld/testsuite/ld-x86-64/libno-plt-1b.dd
@@ -1,7 +1,7 @@
 #objdump: -dwrj.text
 #target: x86_64-*-*
 
-.*: +file format elf64-x86-64.*
+.*: +file format elf.*-x86-64.*
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-x86-64/libno-plt-1b.rd b/ld/testsuite/ld-x86-64/libno-plt-1b.rd
index fa415fd8e7376c9377a86c3cd75af27ea6305916..954e4a548457b8e8fd047b3a71e5af6feda8badb 100644 (file)
--- a/ld/testsuite/ld-x86-64/libno-plt-1b.rd
+++ b/ld/testsuite/ld-x86-64/libno-plt-1b.rd
@@ -2,7 +2,7 @@
 #target: x86_64-*-*
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains [0-9]+ entries:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+ +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ func \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +func \+ 0
 #pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1a.dd b/ld/testsuite/ld-x86-64/no-plt-1a.dd
index 81b62b09c9844eb7f637b1f7d54b341df880e965..b2721e33bae4e60a28b9039a3c05625a35b0848b 100644 (file)
--- a/ld/testsuite/ld-x86-64/no-plt-1a.dd
+++ b/ld/testsuite/ld-x86-64/no-plt-1a.dd
@@ -1,7 +1,7 @@
 #objdump: -dwrj.text
 #target: x86_64-*-*
 
-.*: +file format elf64-x86-64.*
+.*: +file format elf.*-x86-64.*
 
 Disassembly of section .text:
 
@@ -23,7 +23,7 @@ Disassembly of section .text:
  +[a-f0-9]+:   ff 15 ([0-9a-f]{2} ){4}[        ]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
 #...
 [0-9a-f]+ <get_func>:
- +[a-f0-9]+:   48 c7 c0 ([0-9a-f]{2} ){4}[     ]+mov    \$0x[0-9a-f]+,%rax
+ +[a-f0-9]+:   4(0|8) c7 c0 ([0-9a-f]{2} ){4}[         ]+(rex |)mov +\$0x[0-9a-f]+,%(e|r)ax
  +[a-f0-9]+:   c3                      retq   
 #...
 [0-9a-f]+ <call_func>:
diff --git a/ld/testsuite/ld-x86-64/no-plt-1a.rd b/ld/testsuite/ld-x86-64/no-plt-1a.rd
index 78c2a7520643f100282b29b48b1a4a89ae059c27..73365342d004d399ccd00a5df012f41dcd08804e 100644 (file)
--- a/ld/testsuite/ld-x86-64/no-plt-1a.rd
+++ b/ld/testsuite/ld-x86-64/no-plt-1a.rd
@@ -2,9 +2,9 @@
 #target: x86_64-*-*
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains [0-9]+ entries:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+ +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort|puts).* \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort|puts).* \+ 0
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort|puts).* \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort|puts).* \+ 0
 #pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1b.dd b/ld/testsuite/ld-x86-64/no-plt-1b.dd
index 5662a2fca03538b88ef84789de5435e21ea376d6..ccdc4896b612ce3842f1772a88960119af8b8bb3 100644 (file)
--- a/ld/testsuite/ld-x86-64/no-plt-1b.dd
+++ b/ld/testsuite/ld-x86-64/no-plt-1b.dd
@@ -1,7 +1,7 @@
 #objdump: -dwrj.text
 #target: x86_64-*-*
 
-.*: +file format elf64-x86-64.*
+.*: +file format elf.*-x86-64.*
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-x86-64/no-plt-1b.rd b/ld/testsuite/ld-x86-64/no-plt-1b.rd
index 19833b9ca488040f44168c6caf8d76df98c3ae5b..3e6ad0a83fc27ea91e8de2f39b25d846df42393a 100644 (file)
--- a/ld/testsuite/ld-x86-64/no-plt-1b.rd
+++ b/ld/testsuite/ld-x86-64/no-plt-1b.rd
@@ -2,15 +2,15 @@
 #target: x86_64-*-*
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains [0-9]+ entries:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+ +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort.*|puts.*|get_func|call_func|func) \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort.*|puts.*|get_func|call_func|func) \+ 0
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort.*|puts.*|get_func|call_func|func) \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort.*|puts.*|get_func|call_func|func) \+ 0
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort.*|puts.*|get_func|call_func|func) \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort.*|puts.*|get_func|call_func|func) \+ 0
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort.*|puts.*|get_func|call_func|func) \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort.*|puts.*|get_func|call_func|func) \+ 0
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort.*|puts.*|get_func|call_func|func) \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort.*|puts.*|get_func|call_func|func) \+ 0
 #pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1c.dd b/ld/testsuite/ld-x86-64/no-plt-1c.dd
index 197359ee135538683a4004463f27c47106429c8d..2e09a6099e7c5b1dee5fa03dc549f8c88b6cee3b 100644 (file)
--- a/ld/testsuite/ld-x86-64/no-plt-1c.dd
+++ b/ld/testsuite/ld-x86-64/no-plt-1c.dd
@@ -1,7 +1,7 @@
 #objdump: -dwrj.text
 #target: x86_64-*-*
 
-.*: +file format elf64-x86-64.*
+.*: +file format elf.*-x86-64.*
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-x86-64/no-plt-1c.rd b/ld/testsuite/ld-x86-64/no-plt-1c.rd
index ebfea3b3aa227166c11d87ae626ac38600d14fda..2c9ef0c3a015616ac409d7028d920f9b8a4f5227 100644 (file)
--- a/ld/testsuite/ld-x86-64/no-plt-1c.rd
+++ b/ld/testsuite/ld-x86-64/no-plt-1c.rd
@@ -2,13 +2,13 @@
 #target: x86_64-*-*
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains [0-9]+ entries:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+ +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort.*|puts.*|get_func|call_func).* \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort.*|puts.*|get_func|call_func).* \+ 0
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort.*|puts.*|get_func|call_func).* \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort.*|puts.*|get_func|call_func).* \+ 0
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort.*|puts.*|get_func|call_func).* \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort.*|puts.*|get_func|call_func).* \+ 0
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort.*|puts.*|get_func|call_func).* \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort.*|puts.*|get_func|call_func).* \+ 0
 #pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1d.dd b/ld/testsuite/ld-x86-64/no-plt-1d.dd
index 375de617268a748ed2d52a05804cf0a3b5189e18..1920a13e854c6e47e98183248c722846c3d95cb6 100644 (file)
--- a/ld/testsuite/ld-x86-64/no-plt-1d.dd
+++ b/ld/testsuite/ld-x86-64/no-plt-1d.dd
@@ -1,7 +1,7 @@
 #objdump: -dwrj.text
 #target: x86_64-*-*
 
-.*: +file format elf64-x86-64.*
+.*: +file format elf.*-x86-64.*
 
 Disassembly of section .text:
 
@@ -24,7 +24,7 @@ Disassembly of section .text:
  +[a-f0-9]+:   67 e8 ([0-9a-f]{2} ){4}[        ]+addr32 callq [0-9a-f]+ <abort>
 #...
 [0-9a-f]+ <get_func>:
- +[a-f0-9]+:   48 c7 c0 ([0-9a-f]{2} ){4}[     ]+mov    \$0x[0-9a-f]+,%rax
+ +[a-f0-9]+:   4(0|8) c7 c0 ([0-9a-f]{2} ){4}[         ]+(rex |)mov +\$0x[0-9a-f]+,%(e|r)ax
  +[a-f0-9]+:   c3                      retq   
 #...
 [0-9a-f]+ <call_func>:
diff --git a/ld/testsuite/ld-x86-64/no-plt-1e.dd b/ld/testsuite/ld-x86-64/no-plt-1e.dd
index c4b948d852255df46848870259c9d745a40749b8..b0342de6d60cbf01c4288d309352f23c8d47725b 100644 (file)
--- a/ld/testsuite/ld-x86-64/no-plt-1e.dd
+++ b/ld/testsuite/ld-x86-64/no-plt-1e.dd
@@ -1,7 +1,7 @@
 #objdump: -dwrj.text
 #target: x86_64-*-*
 
-.*: +file format elf64-x86-64.*
+.*: +file format elf.*-x86-64.*
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-x86-64/no-plt-1e.rd b/ld/testsuite/ld-x86-64/no-plt-1e.rd
index 78c2a7520643f100282b29b48b1a4a89ae059c27..73365342d004d399ccd00a5df012f41dcd08804e 100644 (file)
--- a/ld/testsuite/ld-x86-64/no-plt-1e.rd
+++ b/ld/testsuite/ld-x86-64/no-plt-1e.rd
@@ -2,9 +2,9 @@
 #target: x86_64-*-*
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains [0-9]+ entries:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+ +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort|puts).* \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort|puts).* \+ 0
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort|puts).* \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort|puts).* \+ 0
 #pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1f.dd b/ld/testsuite/ld-x86-64/no-plt-1f.dd
index 5662a2fca03538b88ef84789de5435e21ea376d6..ccdc4896b612ce3842f1772a88960119af8b8bb3 100644 (file)
--- a/ld/testsuite/ld-x86-64/no-plt-1f.dd
+++ b/ld/testsuite/ld-x86-64/no-plt-1f.dd
@@ -1,7 +1,7 @@
 #objdump: -dwrj.text
 #target: x86_64-*-*
 
-.*: +file format elf64-x86-64.*
+.*: +file format elf.*-x86-64.*
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-x86-64/no-plt-1f.rd b/ld/testsuite/ld-x86-64/no-plt-1f.rd
index 19833b9ca488040f44168c6caf8d76df98c3ae5b..3e6ad0a83fc27ea91e8de2f39b25d846df42393a 100644 (file)
--- a/ld/testsuite/ld-x86-64/no-plt-1f.rd
+++ b/ld/testsuite/ld-x86-64/no-plt-1f.rd
@@ -2,15 +2,15 @@
 #target: x86_64-*-*
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains [0-9]+ entries:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+ +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort.*|puts.*|get_func|call_func|func) \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort.*|puts.*|get_func|call_func|func) \+ 0
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort.*|puts.*|get_func|call_func|func) \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort.*|puts.*|get_func|call_func|func) \+ 0
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort.*|puts.*|get_func|call_func|func) \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort.*|puts.*|get_func|call_func|func) \+ 0
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort.*|puts.*|get_func|call_func|func) \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort.*|puts.*|get_func|call_func|func) \+ 0
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort.*|puts.*|get_func|call_func|func) \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort.*|puts.*|get_func|call_func|func) \+ 0
 #pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1g.dd b/ld/testsuite/ld-x86-64/no-plt-1g.dd
index 00ae97b486472afbcb6f42809519684a22f456de..0c9709753f6ac0d814def628023ff364ad7ec278 100644 (file)
--- a/ld/testsuite/ld-x86-64/no-plt-1g.dd
+++ b/ld/testsuite/ld-x86-64/no-plt-1g.dd
@@ -1,7 +1,7 @@
 #objdump: -dwrj.text
 #target: x86_64-*-*
 
-.*: +file format elf64-x86-64.*
+.*: +file format elf.*-x86-64.*
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-x86-64/no-plt-1g.rd b/ld/testsuite/ld-x86-64/no-plt-1g.rd
index ebfea3b3aa227166c11d87ae626ac38600d14fda..2c9ef0c3a015616ac409d7028d920f9b8a4f5227 100644 (file)
--- a/ld/testsuite/ld-x86-64/no-plt-1g.rd
+++ b/ld/testsuite/ld-x86-64/no-plt-1g.rd
@@ -2,13 +2,13 @@
 #target: x86_64-*-*
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains [0-9]+ entries:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+ +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort.*|puts.*|get_func|call_func).* \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort.*|puts.*|get_func|call_func).* \+ 0
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort.*|puts.*|get_func|call_func).* \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort.*|puts.*|get_func|call_func).* \+ 0
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort.*|puts.*|get_func|call_func).* \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort.*|puts.*|get_func|call_func).* \+ 0
 #...
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ (abort.*|puts.*|get_func|call_func).* \+ 0
+[0-9a-f ]+R_X86_64_GLOB_DAT +0+ +(abort.*|puts.*|get_func|call_func).* \+ 0
 #pass