diff options
| author | Jan Beulich <jbeulich@suse.com> | 2020-07-15 08:53:55 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2020-07-15 08:53:55 +0200 |
| commit | 36938cabf0efcb053d1585e8580a4b3db438ca4e (patch) | |
| tree | e7193f8c5b4f0cc83b6a76a4d5a35f0b86058abd /ld | |
| parent | a8a48c756c0da3a49008662e14ae582764ddd0bb (diff) | |
| download | gdb-36938cabf0efcb053d1585e8580a4b3db438ca4e.zip gdb-36938cabf0efcb053d1585e8580a4b3db438ca4e.tar.gz gdb-36938cabf0efcb053d1585e8580a4b3db438ca4e.tar.bz2 | |
x86: avoid attaching suffixes to unambiguous insns
"Unambiguous" is is in particular taking as reference the assembler,
which also accepts certain insns - despite them allowing for varying
operand size, and hence in principle being ambiguous - without any
suffix. For example, from the very beginning of the life of x86-64 I had
trouble understanding why a plain and simple RET had to be printed as
RETQ. In case someone really used the 16-bit form, RETW disambiguates
the two quite fine.
Diffstat (limited to 'ld')
122 files changed, 690 insertions, 584 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index b667566..3d8b8d6 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,109 @@ +2020-07-15 Jan Beulich <jbeulich@suse.com> + + * testsuite/ld-i386/ibt-plt-1.d, testsuite/ld-i386/ibt-plt-2a.d, + testsuite/ld-i386/ibt-plt-2c.d, testsuite/ld-i386/ibt-plt-3a.d, + testsuite/ld-i386/ibt-plt-3c.d, testsuite/ld-i386/plt-pic.pd, + testsuite/ld-i386/plt-pic2.dd, testsuite/ld-i386/plt.pd, + testsuite/ld-i386/plt2.dd, testsuite/ld-i386/pr19636-1d.d, + testsuite/ld-i386/pr19636-1l.d, testsuite/ld-i386/pr19636-2c.d, + testsuite/ld-i386/pr20830.d, testsuite/ld-i386/vxworks1-lib.dd, + testsuite/ld-i386/vxworks1.dd, + testsuite/ld-ifunc/ifunc-2-i386-now.d, + testsuite/ld-ifunc/ifunc-2-local-i386-now.d, + testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d, + testsuite/ld-ifunc/ifunc-2-x86-64-now.d, + testsuite/ld-ifunc/ifunc-21-x86-64.d, + testsuite/ld-ifunc/ifunc-22-x86-64.d, + testsuite/ld-ifunc/pr17154-i386-now.d, + testsuite/ld-ifunc/pr17154-i386.d, + testsuite/ld-ifunc/pr17154-x86-64-now.d, + testsuite/ld-ifunc/pr17154-x86-64.d, + testsuite/ld-x86-64/align-branch-1.d, + testsuite/ld-x86-64/bnd-branch-1-now.d, + testsuite/ld-x86-64/bnd-branch-1.d, + testsuite/ld-x86-64/bnd-ifunc-1-now.d, + testsuite/ld-x86-64/bnd-ifunc-1.d, + testsuite/ld-x86-64/bnd-ifunc-2-now.d, + testsuite/ld-x86-64/bnd-ifunc-2.d, + testsuite/ld-x86-64/bnd-plt-1-now.d, + testsuite/ld-x86-64/bnd-plt-1.d, + testsuite/ld-x86-64/call1a.d, testsuite/ld-x86-64/call1b.d, + testsuite/ld-x86-64/call1d.d, testsuite/ld-x86-64/call1e.d, + testsuite/ld-x86-64/call1f.d, testsuite/ld-x86-64/call1g.d, + testsuite/ld-x86-64/call1h.d, testsuite/ld-x86-64/call1i.d, + testsuite/ld-x86-64/gotpcrel1.dd, + testsuite/ld-x86-64/hidden2.d, + testsuite/ld-x86-64/ibt-plt-1-x32.d, + testsuite/ld-x86-64/ibt-plt-1.d, + testsuite/ld-x86-64/ibt-plt-2a-x32.d, + testsuite/ld-x86-64/ibt-plt-2a.d, + testsuite/ld-x86-64/ibt-plt-2c-x32.d, + testsuite/ld-x86-64/ibt-plt-2c.d, + testsuite/ld-x86-64/ibt-plt-3a-x32.d, + testsuite/ld-x86-64/ibt-plt-3a.d, + testsuite/ld-x86-64/ibt-plt-3c-x32.d, + testsuite/ld-x86-64/ibt-plt-3c.d, + testsuite/ld-x86-64/libno-plt-1b.dd, + testsuite/ld-x86-64/mpx3.dd, testsuite/ld-x86-64/mpx3n.dd, + testsuite/ld-x86-64/mpx4.dd, testsuite/ld-x86-64/mpx4n.dd, + testsuite/ld-x86-64/no-plt-1a.dd, + testsuite/ld-x86-64/no-plt-1b.dd, + testsuite/ld-x86-64/no-plt-1c.dd, + testsuite/ld-x86-64/no-plt-1d.dd, + testsuite/ld-x86-64/no-plt-1e.dd, + testsuite/ld-x86-64/no-plt-1f.dd, + testsuite/ld-x86-64/no-plt-1g.dd, + testsuite/ld-x86-64/plt-main-bnd.dd, + testsuite/ld-x86-64/plt-main-ibt-x32.dd, + testsuite/ld-x86-64/plt-main-ibt.dd, + testsuite/ld-x86-64/plt.pd, testsuite/ld-x86-64/plt2.dd, + testsuite/ld-x86-64/pr19609-5a.d, + testsuite/ld-x86-64/pr19609-5b.d, + testsuite/ld-x86-64/pr19609-5c.d, + testsuite/ld-x86-64/pr19609-5e.d, + testsuite/ld-x86-64/pr19609-7b.d, + testsuite/ld-x86-64/pr19609-7d.d, + testsuite/ld-x86-64/pr19636-2d.d, + testsuite/ld-x86-64/pr19636-2l.d, + testsuite/ld-x86-64/pr20253-1b.d, + testsuite/ld-x86-64/pr20253-1d.d, + testsuite/ld-x86-64/pr20253-1f.d, + testsuite/ld-x86-64/pr20253-1h.d, + testsuite/ld-x86-64/pr20253-1j.d, + testsuite/ld-x86-64/pr20253-1l.d, + testsuite/ld-x86-64/pr20830a-now.d, + testsuite/ld-x86-64/pr20830a.d, + testsuite/ld-x86-64/pr20830b-now.d, + testsuite/ld-x86-64/pr20830b.d, + testsuite/ld-x86-64/pr21038a-now.d, + testsuite/ld-x86-64/pr21038a.d, + testsuite/ld-x86-64/pr21038b-now.d, + testsuite/ld-x86-64/pr21038b.d, + testsuite/ld-x86-64/pr21038c-now.d, + testsuite/ld-x86-64/pr21038c.d, + testsuite/ld-x86-64/pr23930-x32.d, + testsuite/ld-x86-64/pr23930.d, + testsuite/ld-x86-64/pr25416-1a.d, + testsuite/ld-x86-64/pr25416-2a.d, + testsuite/ld-x86-64/pr26018.d, + testsuite/ld-x86-64/protected2-k1om.d, + testsuite/ld-x86-64/protected2-l1om.d, + testsuite/ld-x86-64/protected2.d, + testsuite/ld-x86-64/protected3.d, + testsuite/ld-x86-64/protected8.d, + testsuite/ld-x86-64/tlsbin.dd, testsuite/ld-x86-64/tlsbin2.dd, + testsuite/ld-x86-64/tlsbindesc.dd, + testsuite/ld-x86-64/tlsdesc.dd, + testsuite/ld-x86-64/tlsdesc.pd, + testsuite/ld-x86-64/tlsgd10.dd, + testsuite/ld-x86-64/tlsgd7.dd, testsuite/ld-x86-64/tlsgd8.dd, + testsuite/ld-x86-64/tlsgd9.dd, + testsuite/ld-x86-64/tlsgdesc.dd, + testsuite/ld-x86-64/tlsld3.dd, testsuite/ld-x86-64/tlsld4.dd, + testsuite/ld-x86-64/tlspic.dd, testsuite/ld-x86-64/tlspic2.dd, + testsuite/ld-x86-64/tlspie2b.d, testsuite/ld-x86-64/tlspie2c.d: + Adjust expectations. + 2020-07-15 Hans-Peter Nilsson <hp@bitrange.com> * testsuite/ld-mmix/undef-1.d, testsuite/ld-mmix/undef-1m.d, diff --git a/ld/testsuite/ld-i386/ibt-plt-1.d b/ld/testsuite/ld-i386/ibt-plt-1.d index beccbf7..a7eaa1f 100644 --- a/ld/testsuite/ld-i386/ibt-plt-1.d +++ b/ld/testsuite/ld-i386/ibt-plt-1.d @@ -8,7 +8,7 @@ Disassembly of section .plt: [a-f0-9]+ <.plt>: - +[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\) + +[a-f0-9]+: ff b3 04 00 00 00 push 0x4\(%ebx\) +[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\) +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%eax\) +[a-f0-9]+: f3 0f 1e fb endbr32 diff --git a/ld/testsuite/ld-i386/ibt-plt-2a.d b/ld/testsuite/ld-i386/ibt-plt-2a.d index 5825be4..9c8f599 100644 --- a/ld/testsuite/ld-i386/ibt-plt-2a.d +++ b/ld/testsuite/ld-i386/ibt-plt-2a.d @@ -9,7 +9,7 @@ Disassembly of section .plt: 0+140 <.plt>: - +[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\) + +[a-f0-9]+: ff b3 04 00 00 00 push 0x4\(%ebx\) +[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\) +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%eax\) +[a-f0-9]+: f3 0f 1e fb endbr32 diff --git a/ld/testsuite/ld-i386/ibt-plt-2c.d b/ld/testsuite/ld-i386/ibt-plt-2c.d index 7193034..a9c8642 100644 --- a/ld/testsuite/ld-i386/ibt-plt-2c.d +++ b/ld/testsuite/ld-i386/ibt-plt-2c.d @@ -9,7 +9,7 @@ Disassembly of section .plt: [a-f0-9]+ <.plt>: - +[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\) + +[a-f0-9]+: ff b3 04 00 00 00 push 0x4\(%ebx\) +[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\) +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%eax\) +[a-f0-9]+: f3 0f 1e fb endbr32 diff --git a/ld/testsuite/ld-i386/ibt-plt-3a.d b/ld/testsuite/ld-i386/ibt-plt-3a.d index 4bbf1a3..b4366c9 100644 --- a/ld/testsuite/ld-i386/ibt-plt-3a.d +++ b/ld/testsuite/ld-i386/ibt-plt-3a.d @@ -9,7 +9,7 @@ Disassembly of section .plt: 0+140 <.plt>: - +[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\) + +[a-f0-9]+: ff b3 04 00 00 00 push 0x4\(%ebx\) +[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\) +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%eax\) +[a-f0-9]+: f3 0f 1e fb endbr32 diff --git a/ld/testsuite/ld-i386/ibt-plt-3c.d b/ld/testsuite/ld-i386/ibt-plt-3c.d index 4bbf1a3..b4366c9 100644 --- a/ld/testsuite/ld-i386/ibt-plt-3c.d +++ b/ld/testsuite/ld-i386/ibt-plt-3c.d @@ -9,7 +9,7 @@ Disassembly of section .plt: 0+140 <.plt>: - +[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\) + +[a-f0-9]+: ff b3 04 00 00 00 push 0x4\(%ebx\) +[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\) +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%eax\) +[a-f0-9]+: f3 0f 1e fb endbr32 diff --git a/ld/testsuite/ld-i386/plt-pic.pd b/ld/testsuite/ld-i386/plt-pic.pd index 4122c46..5c047d4 100644 --- a/ld/testsuite/ld-i386/plt-pic.pd +++ b/ld/testsuite/ld-i386/plt-pic.pd @@ -9,7 +9,7 @@ Disassembly of section .plt: [0-9a-f]+ <.plt>: - +[0-9a-f]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\) + +[0-9a-f]+: ff b3 04 00 00 00 push 0x4\(%ebx\) +[0-9a-f]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\) #... diff --git a/ld/testsuite/ld-i386/plt-pic2.dd b/ld/testsuite/ld-i386/plt-pic2.dd index 1d81c76..8162234 100644 --- a/ld/testsuite/ld-i386/plt-pic2.dd +++ b/ld/testsuite/ld-i386/plt-pic2.dd @@ -10,7 +10,7 @@ Disassembly of section .plt: .* <.plt>: - +[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\) + +[a-f0-9]+: ff b3 04 00 00 00 push 0x4\(%ebx\) +[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\) +[a-f0-9]+: 00 00 add %al,\(%eax\) ... diff --git a/ld/testsuite/ld-i386/plt.pd b/ld/testsuite/ld-i386/plt.pd index a6e6d35..efcd8a1 100644 --- a/ld/testsuite/ld-i386/plt.pd +++ b/ld/testsuite/ld-i386/plt.pd @@ -9,7 +9,7 @@ Disassembly of section .plt: [0-9a-f]+ <.plt>: - +[0-9a-f]+: ff 35 ([0-9a-f]{2} ){4} * pushl 0x[0-9a-f]+ + +[0-9a-f]+: ff 35 ([0-9a-f]{2} ){4} * push 0x[0-9a-f]+ +[0-9a-f]+: ff 25 ([0-9a-f]{2} ){4} * jmp \*0x[0-9a-f]+ #... diff --git a/ld/testsuite/ld-i386/plt2.dd b/ld/testsuite/ld-i386/plt2.dd index f1a49e5..c9d673f 100644 --- a/ld/testsuite/ld-i386/plt2.dd +++ b/ld/testsuite/ld-i386/plt2.dd @@ -10,7 +10,7 @@ Disassembly of section .plt: 0+8048160 <.plt>: - +[a-f0-9]+: ff 35 40 92 04 08 pushl 0x8049240 + +[a-f0-9]+: ff 35 40 92 04 08 push 0x8049240 +[a-f0-9]+: ff 25 44 92 04 08 jmp \*0x8049244 +[a-f0-9]+: 00 00 add %al,\(%eax\) ... diff --git a/ld/testsuite/ld-i386/pr19636-1d.d b/ld/testsuite/ld-i386/pr19636-1d.d index b034e30..b7e6aba 100644 --- a/ld/testsuite/ld-i386/pr19636-1d.d +++ b/ld/testsuite/ld-i386/pr19636-1d.d @@ -9,7 +9,7 @@ Disassembly of section .plt: .* <.plt>: -[ ]*[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\) +[ ]*[a-f0-9]+: ff b3 04 00 00 00 push 0x4\(%ebx\) [ ]*[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\) [ ]*[a-f0-9]+: 00 00 add %al,\(%eax\) [ ]*[a-f0-9]+: 00 00 add %al,\(%eax\) diff --git a/ld/testsuite/ld-i386/pr19636-1l.d b/ld/testsuite/ld-i386/pr19636-1l.d index 4567c53..8f2a8e5 100644 --- a/ld/testsuite/ld-i386/pr19636-1l.d +++ b/ld/testsuite/ld-i386/pr19636-1l.d @@ -10,7 +10,7 @@ Disassembly of section .plt: .* <.plt>: -[ ]*[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\) +[ ]*[a-f0-9]+: ff b3 04 00 00 00 push 0x4\(%ebx\) [ ]*[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\) [ ]*[a-f0-9]+: 00 00 add %al,\(%eax\) [ ]*[a-f0-9]+: 00 00 add %al,\(%eax\) diff --git a/ld/testsuite/ld-i386/pr19636-2c.d b/ld/testsuite/ld-i386/pr19636-2c.d index e3b737b..4b49c81 100644 --- a/ld/testsuite/ld-i386/pr19636-2c.d +++ b/ld/testsuite/ld-i386/pr19636-2c.d @@ -9,7 +9,7 @@ Disassembly of section .plt: .* <.plt>: -[ ]*[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\) +[ ]*[a-f0-9]+: ff b3 04 00 00 00 push 0x4\(%ebx\) [ ]*[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\) [ ]*[a-f0-9]+: 00 00 add %al,\(%eax\) [ ]*[a-f0-9]+: 00 00 add %al,\(%eax\) diff --git a/ld/testsuite/ld-i386/pr20830.d b/ld/testsuite/ld-i386/pr20830.d index 5532207..8a14a60 100644 --- a/ld/testsuite/ld-i386/pr20830.d +++ b/ld/testsuite/ld-i386/pr20830.d @@ -41,7 +41,7 @@ Contents of the .eh_frame section: Disassembly of section .plt: 0+110 <.plt>: - +[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\) + +[a-f0-9]+: ff b3 04 00 00 00 push 0x4\(%ebx\) +[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\) +[a-f0-9]+: 00 00 add %al,\(%eax\) ... diff --git a/ld/testsuite/ld-i386/vxworks1-lib.dd b/ld/testsuite/ld-i386/vxworks1-lib.dd index 6d56eb2..c9fc054 100644 --- a/ld/testsuite/ld-i386/vxworks1-lib.dd +++ b/ld/testsuite/ld-i386/vxworks1-lib.dd @@ -4,7 +4,7 @@ Disassembly of section \.plt: 00080800 <_PROCEDURE_LINKAGE_TABLE_>: - 80800: ff b3 04 00 00 00 pushl 0x4\(%ebx\) + 80800: ff b3 04 00 00 00 push 0x4\(%ebx\) 80806: ff a3 08 00 00 00 jmp \*0x8\(%ebx\) 8080c: 90 nop 8080d: 90 nop diff --git a/ld/testsuite/ld-i386/vxworks1.dd b/ld/testsuite/ld-i386/vxworks1.dd index 02b8bc0..80f93c9 100644 --- a/ld/testsuite/ld-i386/vxworks1.dd +++ b/ld/testsuite/ld-i386/vxworks1.dd @@ -4,7 +4,7 @@ Disassembly of section \.plt: 00080800 <_PROCEDURE_LINKAGE_TABLE_>: - 80800: ff 35 04 14 08 00 pushl 0x81404 + 80800: ff 35 04 14 08 00 push 0x81404 80802: R_386_32 _GLOBAL_OFFSET_TABLE_ 80806: ff 25 08 14 08 00 jmp \*0x81408 80808: R_386_32 _GLOBAL_OFFSET_TABLE_ diff --git a/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d b/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d index 622def0..2c917fa 100644 --- a/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d +++ b/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d @@ -11,7 +11,7 @@ Disassembly of section .plt: 0+f0 <.plt>: - +[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\) + +[a-f0-9]+: ff b3 04 00 00 00 push 0x4\(%ebx\) +[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\) +[a-f0-9]+: 00 00 add %al,\(%eax\) ... diff --git a/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d b/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d index 87ae682..01f6a78 100644 --- a/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d +++ b/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d @@ -11,7 +11,7 @@ Disassembly of section .plt: 0+e0 <.plt>: - +[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\) + +[a-f0-9]+: ff b3 04 00 00 00 push 0x4\(%ebx\) +[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\) +[a-f0-9]+: 00 00 add %al,\(%eax\) ... diff --git a/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d b/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d index 75aa37f3..375cecd 100644 --- a/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d +++ b/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d @@ -10,22 +10,22 @@ Disassembly of section .plt: 0+170 <.plt>: - +[a-f0-9]+: ff 35 42 01 20 00 pushq 0x200142\(%rip\) # 2002b8 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: ff 25 44 01 20 00 jmpq \*0x200144\(%rip\) # 2002c0 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 42 01 20 00 push 0x200142\(%rip\) # 2002b8 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: ff 25 44 01 20 00 jmp \*0x200144\(%rip\) # 2002c0 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) 0+180 <\*ABS\*\+0x190@plt>: - +[a-f0-9]+: ff 25 42 01 20 00 jmpq \*0x200142\(%rip\) # 2002c8 <_GLOBAL_OFFSET_TABLE_\+0x18> - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: e9 e0 ff ff ff jmpq 170 <.plt> + +[a-f0-9]+: ff 25 42 01 20 00 jmp \*0x200142\(%rip\) # 2002c8 <_GLOBAL_OFFSET_TABLE_\+0x18> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: e9 e0 ff ff ff jmp 170 <.plt> Disassembly of section .text: 0+190 <foo>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * 0+191 <bar>: - +[a-f0-9]+: e8 ea ff ff ff callq 180 <\*ABS\*\+0x190@plt> + +[a-f0-9]+: e8 ea ff ff ff call 180 <\*ABS\*\+0x190@plt> +[a-f0-9]+: 48 8d 05 e3 ff ff ff lea -0x1d\(%rip\),%rax # 180 <\*ABS\*\+0x190@plt> - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-ifunc/ifunc-2-x86-64-now.d b/ld/testsuite/ld-ifunc/ifunc-2-x86-64-now.d index 591825d..9cd3518 100644 --- a/ld/testsuite/ld-ifunc/ifunc-2-x86-64-now.d +++ b/ld/testsuite/ld-ifunc/ifunc-2-x86-64-now.d @@ -10,22 +10,22 @@ Disassembly of section .plt: 0+170 <.plt>: - +[a-f0-9]+: ff 35 42 01 20 00 pushq 0x200142\(%rip\) # 2002b8 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: ff 25 44 01 20 00 jmpq \*0x200144\(%rip\) # 2002c0 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 42 01 20 00 push 0x200142\(%rip\) # 2002b8 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: ff 25 44 01 20 00 jmp \*0x200144\(%rip\) # 2002c0 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) 0+180 <\*ABS\*\+0x190@plt>: - +[a-f0-9]+: ff 25 42 01 20 00 jmpq \*0x200142\(%rip\) # 2002c8 <_GLOBAL_OFFSET_TABLE_\+0x18> - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: e9 e0 ff ff ff jmpq 170 <.plt> + +[a-f0-9]+: ff 25 42 01 20 00 jmp \*0x200142\(%rip\) # 2002c8 <_GLOBAL_OFFSET_TABLE_\+0x18> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: e9 e0 ff ff ff jmp 170 <.plt> Disassembly of section .text: 0+190 <foo>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * 0+191 <bar>: - +[a-f0-9]+: e8 ea ff ff ff callq 180 <\*ABS\*\+0x190@plt> + +[a-f0-9]+: e8 ea ff ff ff call 180 <\*ABS\*\+0x190@plt> +[a-f0-9]+: 48 8d 05 e3 ff ff ff lea -0x1d\(%rip\),%rax # 180 <\*ABS\*\+0x190@plt> - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-ifunc/ifunc-21-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-21-x86-64.d index dbddc55..de12e9f 100644 --- a/ld/testsuite/ld-ifunc/ifunc-21-x86-64.d +++ b/ld/testsuite/ld-ifunc/ifunc-21-x86-64.d @@ -9,16 +9,16 @@ Disassembly of section .text: 0+4000c8 <__start>: - +[a-f0-9]+: ff 15 2a 00 20 00 callq \*0x20002a\(%rip\) # 6000f8 <.got> - +[a-f0-9]+: ff 25 24 00 20 00 jmpq \*0x200024\(%rip\) # 6000f8 <.got> + +[a-f0-9]+: ff 15 2a 00 20 00 call \*0x20002a\(%rip\) # 6000f8 <.got> + +[a-f0-9]+: ff 25 24 00 20 00 jmp \*0x200024\(%rip\) # 6000f8 <.got> +[a-f0-9]+: 48 03 05 1d 00 20 00 add 0x20001d\(%rip\),%rax # 6000f8 <.got> +[a-f0-9]+: 48 8b 05 16 00 20 00 mov 0x200016\(%rip\),%rax # 6000f8 <.got> +[a-f0-9]+: 48 85 05 0f 00 20 00 test %rax,0x20000f\(%rip\) # 6000f8 <.got> +[a-f0-9]+: 48 c7 c0 f1 00 40 00 mov \$0x4000f1,%rax 0+4000f0 <foo>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * 0+4000f1 <bar>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-ifunc/ifunc-22-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-22-x86-64.d index dbddc55..de12e9f 100644 --- a/ld/testsuite/ld-ifunc/ifunc-22-x86-64.d +++ b/ld/testsuite/ld-ifunc/ifunc-22-x86-64.d @@ -9,16 +9,16 @@ Disassembly of section .text: 0+4000c8 <__start>: - +[a-f0-9]+: ff 15 2a 00 20 00 callq \*0x20002a\(%rip\) # 6000f8 <.got> - +[a-f0-9]+: ff 25 24 00 20 00 jmpq \*0x200024\(%rip\) # 6000f8 <.got> + +[a-f0-9]+: ff 15 2a 00 20 00 call \*0x20002a\(%rip\) # 6000f8 <.got> + +[a-f0-9]+: ff 25 24 00 20 00 jmp \*0x200024\(%rip\) # 6000f8 <.got> +[a-f0-9]+: 48 03 05 1d 00 20 00 add 0x20001d\(%rip\),%rax # 6000f8 <.got> +[a-f0-9]+: 48 8b 05 16 00 20 00 mov 0x200016\(%rip\),%rax # 6000f8 <.got> +[a-f0-9]+: 48 85 05 0f 00 20 00 test %rax,0x20000f\(%rip\) # 6000f8 <.got> +[a-f0-9]+: 48 c7 c0 f1 00 40 00 mov \$0x4000f1,%rax 0+4000f0 <foo>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * 0+4000f1 <bar>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-ifunc/pr17154-i386-now.d b/ld/testsuite/ld-ifunc/pr17154-i386-now.d index c6667b7..082d067 100644 --- a/ld/testsuite/ld-ifunc/pr17154-i386-now.d +++ b/ld/testsuite/ld-ifunc/pr17154-i386-now.d @@ -11,7 +11,7 @@ Disassembly of section .plt: 0+180 <.plt>: - +[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\) + +[a-f0-9]+: ff b3 04 00 00 00 push 0x4\(%ebx\) +[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\) +[a-f0-9]+: 00 00 add %al,\(%eax\) ... diff --git a/ld/testsuite/ld-ifunc/pr17154-i386.d b/ld/testsuite/ld-ifunc/pr17154-i386.d index b2c8cf2..68123bf 100644 --- a/ld/testsuite/ld-ifunc/pr17154-i386.d +++ b/ld/testsuite/ld-ifunc/pr17154-i386.d @@ -7,7 +7,7 @@ #... 0+180 <.*>: -[ ]*[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\) +[ ]*[a-f0-9]+: ff b3 04 00 00 00 push 0x4\(%ebx\) [ ]*[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\) [ ]*[a-f0-9]+: 00 00 add %al,\(%eax\) ... diff --git a/ld/testsuite/ld-ifunc/pr17154-x86-64-now.d b/ld/testsuite/ld-ifunc/pr17154-x86-64-now.d index 6905148..928a6a7 100644 --- a/ld/testsuite/ld-ifunc/pr17154-x86-64-now.d +++ b/ld/testsuite/ld-ifunc/pr17154-x86-64-now.d @@ -10,41 +10,41 @@ Disassembly of section .plt: 0+240 <.plt>: - +[a-f0-9]+: ff 35 7a 01 20 00 pushq 0x20017a\(%rip\) # 2003c0 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: ff 25 7c 01 20 00 jmpq \*0x20017c\(%rip\) # 2003c8 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 7a 01 20 00 push 0x20017a\(%rip\) # 2003c0 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: ff 25 7c 01 20 00 jmp \*0x20017c\(%rip\) # 2003c8 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) 0+250 <\*ABS\*\+0x29a@plt>: - +[a-f0-9]+: ff 25 7a 01 20 00 jmpq \*0x20017a\(%rip\) # 2003d0 <_GLOBAL_OFFSET_TABLE_\+0x18> - +[a-f0-9]+: 68 03 00 00 00 pushq \$0x3 - +[a-f0-9]+: e9 e0 ff ff ff jmpq 240 <.plt> + +[a-f0-9]+: ff 25 7a 01 20 00 jmp \*0x20017a\(%rip\) # 2003d0 <_GLOBAL_OFFSET_TABLE_\+0x18> + +[a-f0-9]+: 68 03 00 00 00 push \$0x3 + +[a-f0-9]+: e9 e0 ff ff ff jmp 240 <.plt> 0+260 <func1@plt>: - +[a-f0-9]+: ff 25 72 01 20 00 jmpq \*0x200172\(%rip\) # 2003d8 <func1> - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: e9 d0 ff ff ff jmpq 240 <.plt> + +[a-f0-9]+: ff 25 72 01 20 00 jmp \*0x200172\(%rip\) # 2003d8 <func1> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: e9 d0 ff ff ff jmp 240 <.plt> 0+270 <func2@plt>: - +[a-f0-9]+: ff 25 6a 01 20 00 jmpq \*0x20016a\(%rip\) # 2003e0 <func2> - +[a-f0-9]+: 68 01 00 00 00 pushq \$0x1 - +[a-f0-9]+: e9 c0 ff ff ff jmpq 240 <.plt> + +[a-f0-9]+: ff 25 6a 01 20 00 jmp \*0x20016a\(%rip\) # 2003e0 <func2> + +[a-f0-9]+: 68 01 00 00 00 push \$0x1 + +[a-f0-9]+: e9 c0 ff ff ff jmp 240 <.plt> 0+280 <\*ABS\*\+0x290@plt>: - +[a-f0-9]+: ff 25 62 01 20 00 jmpq \*0x200162\(%rip\) # 2003e8 <_GLOBAL_OFFSET_TABLE_\+0x30> - +[a-f0-9]+: 68 02 00 00 00 pushq \$0x2 - +[a-f0-9]+: e9 b0 ff ff ff jmpq 240 <.plt> + +[a-f0-9]+: ff 25 62 01 20 00 jmp \*0x200162\(%rip\) # 2003e8 <_GLOBAL_OFFSET_TABLE_\+0x30> + +[a-f0-9]+: 68 02 00 00 00 push \$0x2 + +[a-f0-9]+: e9 b0 ff ff ff jmp 240 <.plt> Disassembly of section .text: 0+290 <resolve1>: - +[a-f0-9]+: e8 cb ff ff ff callq 260 <func1@plt> + +[a-f0-9]+: e8 cb ff ff ff call 260 <func1@plt> 0+295 <g1>: - +[a-f0-9]+: e9 e6 ff ff ff jmpq 280 <\*ABS\*\+0x290@plt> + +[a-f0-9]+: e9 e6 ff ff ff jmp 280 <\*ABS\*\+0x290@plt> 0+29a <resolve2>: - +[a-f0-9]+: e8 d1 ff ff ff callq 270 <func2@plt> + +[a-f0-9]+: e8 d1 ff ff ff call 270 <func2@plt> 0+29f <g2>: - +[a-f0-9]+: e9 ac ff ff ff jmpq 250 <\*ABS\*\+0x29a@plt> + +[a-f0-9]+: e9 ac ff ff ff jmp 250 <\*ABS\*\+0x29a@plt> #pass diff --git a/ld/testsuite/ld-ifunc/pr17154-x86-64.d b/ld/testsuite/ld-ifunc/pr17154-x86-64.d index bd8f739..8a6861d 100644 --- a/ld/testsuite/ld-ifunc/pr17154-x86-64.d +++ b/ld/testsuite/ld-ifunc/pr17154-x86-64.d @@ -6,41 +6,41 @@ #... 0+240 <.*>: - +[a-f0-9]+: ff 35 5a 01 20 00 pushq 0x20015a\(%rip\) # 2003a0 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: ff 25 5c 01 20 00 jmpq \*0x20015c\(%rip\) # 2003a8 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 5a 01 20 00 push 0x20015a\(%rip\) # 2003a0 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: ff 25 5c 01 20 00 jmp \*0x20015c\(%rip\) # 2003a8 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) 0+250 <\*ABS\*\+0x29a@plt>: - +[a-f0-9]+: ff 25 5a 01 20 00 jmpq \*0x20015a\(%rip\) # 2003b0 <_GLOBAL_OFFSET_TABLE_\+0x18> - +[a-f0-9]+: 68 03 00 00 00 pushq \$0x3 - +[a-f0-9]+: e9 e0 ff ff ff jmpq 240 <.plt> + +[a-f0-9]+: ff 25 5a 01 20 00 jmp \*0x20015a\(%rip\) # 2003b0 <_GLOBAL_OFFSET_TABLE_\+0x18> + +[a-f0-9]+: 68 03 00 00 00 push \$0x3 + +[a-f0-9]+: e9 e0 ff ff ff jmp 240 <.plt> 0+260 <func1@plt>: - +[a-f0-9]+: ff 25 52 01 20 00 jmpq \*0x200152\(%rip\) # 2003b8 <func1> - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: e9 d0 ff ff ff jmpq 240 <.plt> + +[a-f0-9]+: ff 25 52 01 20 00 jmp \*0x200152\(%rip\) # 2003b8 <func1> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: e9 d0 ff ff ff jmp 240 <.plt> 0+270 <func2@plt>: - +[a-f0-9]+: ff 25 4a 01 20 00 jmpq \*0x20014a\(%rip\) # 2003c0 <func2> - +[a-f0-9]+: 68 01 00 00 00 pushq \$0x1 - +[a-f0-9]+: e9 c0 ff ff ff jmpq 240 <.plt> + +[a-f0-9]+: ff 25 4a 01 20 00 jmp \*0x20014a\(%rip\) # 2003c0 <func2> + +[a-f0-9]+: 68 01 00 00 00 push \$0x1 + +[a-f0-9]+: e9 c0 ff ff ff jmp 240 <.plt> 0+280 <\*ABS\*\+0x290@plt>: - +[a-f0-9]+: ff 25 42 01 20 00 jmpq \*0x200142\(%rip\) # 2003c8 <_GLOBAL_OFFSET_TABLE_\+0x30> - +[a-f0-9]+: 68 02 00 00 00 pushq \$0x2 - +[a-f0-9]+: e9 b0 ff ff ff jmpq 240 <.plt> + +[a-f0-9]+: ff 25 42 01 20 00 jmp \*0x200142\(%rip\) # 2003c8 <_GLOBAL_OFFSET_TABLE_\+0x30> + +[a-f0-9]+: 68 02 00 00 00 push \$0x2 + +[a-f0-9]+: e9 b0 ff ff ff jmp 240 <.plt> Disassembly of section .text: 0+290 <resolve1>: - +[a-f0-9]+: e8 cb ff ff ff callq 260 <func1@plt> + +[a-f0-9]+: e8 cb ff ff ff call 260 <func1@plt> 0+295 <g1>: - +[a-f0-9]+: e9 e6 ff ff ff jmpq 280 <\*ABS\*\+0x290@plt> + +[a-f0-9]+: e9 e6 ff ff ff jmp 280 <\*ABS\*\+0x290@plt> 0+29a <resolve2>: - +[a-f0-9]+: e8 d1 ff ff ff callq 270 <func2@plt> + +[a-f0-9]+: e8 d1 ff ff ff call 270 <func2@plt> 0+29f <g2>: - +[a-f0-9]+: e9 ac ff ff ff jmpq 250 <\*ABS\*\+0x29a@plt> + +[a-f0-9]+: e9 ac ff ff ff jmp 250 <\*ABS\*\+0x29a@plt> #pass diff --git a/ld/testsuite/ld-x86-64/align-branch-1.d b/ld/testsuite/ld-x86-64/align-branch-1.d index c980b90..19ac6a8 100644 --- a/ld/testsuite/ld-x86-64/align-branch-1.d +++ b/ld/testsuite/ld-x86-64/align-branch-1.d @@ -16,5 +16,5 @@ Disassembly of section .text: +[a-f0-9]+: 2e 2e 2e 2e 48 8b 98 fc ff ff ff cs cs cs mov %cs:-0x4\(%rax\),%rbx +[a-f0-9]+: 48 85 db test %rbx,%rbx +[a-f0-9]+: 74 00 je [a-f0-9]+ <_start\+0x25> - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/bnd-branch-1-now.d b/ld/testsuite/ld-x86-64/bnd-branch-1-now.d index dc48b4c..9640bea 100644 --- a/ld/testsuite/ld-x86-64/bnd-branch-1-now.d +++ b/ld/testsuite/ld-x86-64/bnd-branch-1-now.d @@ -9,37 +9,37 @@ Disassembly of section .plt: 0+230 <.plt>: - +[a-f0-9]+: ff 35 82 01 20 00 pushq 0x200182\(%rip\) # 2003b8 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: ff 25 84 01 20 00 jmpq \*0x200184\(%rip\) # 2003c0 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 82 01 20 00 push 0x200182\(%rip\) # 2003b8 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: ff 25 84 01 20 00 jmp \*0x200184\(%rip\) # 2003c0 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) 0+240 <foo2@plt>: - +[a-f0-9]+: ff 25 82 01 20 00 jmpq \*0x200182\(%rip\) # 2003c8 <foo2> - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: e9 e0 ff ff ff jmpq 230 <.plt> + +[a-f0-9]+: ff 25 82 01 20 00 jmp \*0x200182\(%rip\) # 2003c8 <foo2> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: e9 e0 ff ff ff jmp 230 <.plt> 0+250 <foo3@plt>: - +[a-f0-9]+: ff 25 7a 01 20 00 jmpq \*0x20017a\(%rip\) # 2003d0 <foo3> - +[a-f0-9]+: 68 01 00 00 00 pushq \$0x1 - +[a-f0-9]+: e9 d0 ff ff ff jmpq 230 <.plt> + +[a-f0-9]+: ff 25 7a 01 20 00 jmp \*0x20017a\(%rip\) # 2003d0 <foo3> + +[a-f0-9]+: 68 01 00 00 00 push \$0x1 + +[a-f0-9]+: e9 d0 ff ff ff jmp 230 <.plt> 0+260 <foo1@plt>: - +[a-f0-9]+: ff 25 72 01 20 00 jmpq \*0x200172\(%rip\) # 2003d8 <foo1> - +[a-f0-9]+: 68 02 00 00 00 pushq \$0x2 - +[a-f0-9]+: e9 c0 ff ff ff jmpq 230 <.plt> + +[a-f0-9]+: ff 25 72 01 20 00 jmp \*0x200172\(%rip\) # 2003d8 <foo1> + +[a-f0-9]+: 68 02 00 00 00 push \$0x2 + +[a-f0-9]+: e9 c0 ff ff ff jmp 230 <.plt> 0+270 <foo4@plt>: - +[a-f0-9]+: ff 25 6a 01 20 00 jmpq \*0x20016a\(%rip\) # 2003e0 <foo4> - +[a-f0-9]+: 68 03 00 00 00 pushq \$0x3 - +[a-f0-9]+: e9 b0 ff ff ff jmpq 230 <.plt> + +[a-f0-9]+: ff 25 6a 01 20 00 jmp \*0x20016a\(%rip\) # 2003e0 <foo4> + +[a-f0-9]+: 68 03 00 00 00 push \$0x3 + +[a-f0-9]+: e9 b0 ff ff ff jmp 230 <.plt> Disassembly of section .text: 0+280 <_start>: - +[a-f0-9]+: f2 e9 da ff ff ff bnd jmpq 260 <foo1@plt> - +[a-f0-9]+: e8 b5 ff ff ff callq 240 <foo2@plt> - +[a-f0-9]+: e9 c0 ff ff ff jmpq 250 <foo3@plt> - +[a-f0-9]+: e8 db ff ff ff callq 270 <foo4@plt> - +[a-f0-9]+: f2 e8 b5 ff ff ff bnd callq 250 <foo3@plt> - +[a-f0-9]+: e9 d0 ff ff ff jmpq 270 <foo4@plt> + +[a-f0-9]+: f2 e9 da ff ff ff bnd jmp 260 <foo1@plt> + +[a-f0-9]+: e8 b5 ff ff ff call 240 <foo2@plt> + +[a-f0-9]+: e9 c0 ff ff ff jmp 250 <foo3@plt> + +[a-f0-9]+: e8 db ff ff ff call 270 <foo4@plt> + +[a-f0-9]+: f2 e8 b5 ff ff ff bnd call 250 <foo3@plt> + +[a-f0-9]+: e9 d0 ff ff ff jmp 270 <foo4@plt> #pass diff --git a/ld/testsuite/ld-x86-64/bnd-branch-1.d b/ld/testsuite/ld-x86-64/bnd-branch-1.d index 8368f37..dfcf0d0 100644 --- a/ld/testsuite/ld-x86-64/bnd-branch-1.d +++ b/ld/testsuite/ld-x86-64/bnd-branch-1.d @@ -10,10 +10,10 @@ Disassembly of section .text: #... [a-f0-9]+ <_start>: -[ ]*[a-f0-9]+: f2 e9 [a-f0-9]+ ff ff ff bnd jmpq [a-f0-9]+ <foo1@plt> -[ ]*[a-f0-9]+: e8 [a-f0-9]+ ff ff ff callq [a-f0-9]+ <foo2@plt> -[ ]*[a-f0-9]+: e9 [a-f0-9]+ ff ff ff jmpq [a-f0-9]+ <foo3@plt> -[ ]*[a-f0-9]+: e8 [a-f0-9]+ ff ff ff callq [a-f0-9]+ <foo4@plt> -[ ]*[a-f0-9]+: f2 e8 [a-f0-9]+ ff ff ff bnd callq [a-f0-9]+ <foo3@plt> -[ ]*[a-f0-9]+: e9 [a-f0-9]+ ff ff ff jmpq [a-f0-9]+ <foo4@plt> +[ ]*[a-f0-9]+: f2 e9 [a-f0-9]+ ff ff ff bnd jmp [a-f0-9]+ <foo1@plt> +[ ]*[a-f0-9]+: e8 [a-f0-9]+ ff ff ff call [a-f0-9]+ <foo2@plt> +[ ]*[a-f0-9]+: e9 [a-f0-9]+ ff ff ff jmp [a-f0-9]+ <foo3@plt> +[ ]*[a-f0-9]+: e8 [a-f0-9]+ ff ff ff call [a-f0-9]+ <foo4@plt> +[ ]*[a-f0-9]+: f2 e8 [a-f0-9]+ ff ff ff bnd call [a-f0-9]+ <foo3@plt> +[ ]*[a-f0-9]+: e9 [a-f0-9]+ ff ff ff jmp [a-f0-9]+ <foo4@plt> #pass diff --git a/ld/testsuite/ld-x86-64/bnd-ifunc-1-now.d b/ld/testsuite/ld-x86-64/bnd-ifunc-1-now.d index 4d8e9ab..25af7f8 100644 --- a/ld/testsuite/ld-x86-64/bnd-ifunc-1-now.d +++ b/ld/testsuite/ld-x86-64/bnd-ifunc-1-now.d @@ -9,25 +9,25 @@ Disassembly of section .plt: 0+170 <.plt>: - +[a-f0-9]+: ff 35 4a 01 20 00 pushq 0x20014a\(%rip\) # 2002c0 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: f2 ff 25 4b 01 20 00 bnd jmpq \*0x20014b\(%rip\) # 2002c8 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 4a 01 20 00 push 0x20014a\(%rip\) # 2002c0 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: f2 ff 25 4b 01 20 00 bnd jmp \*0x20014b\(%rip\) # 2002c8 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmpq 170 <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmp 170 <.plt> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) Disassembly of section .plt.sec: 0+190 <\*ABS\*\+0x198@plt>: - +[a-f0-9]+: f2 ff 25 39 01 20 00 bnd jmpq \*0x200139\(%rip\) # 2002d0 <_GLOBAL_OFFSET_TABLE_\+0x18> + +[a-f0-9]+: f2 ff 25 39 01 20 00 bnd jmp \*0x200139\(%rip\) # 2002d0 <_GLOBAL_OFFSET_TABLE_\+0x18> +[a-f0-9]+: 90 nop Disassembly of section .text: 0+198 <foo>: - +[a-f0-9]+: f2 c3 bnd retq + +[a-f0-9]+: f2 c3 bnd ret * 0+19a <bar>: - +[a-f0-9]+: f2 e8 f0 ff ff ff bnd callq 190 <\*ABS\*\+0x198@plt> - +[a-f0-9]+: f2 c3 bnd retq + +[a-f0-9]+: f2 e8 f0 ff ff ff bnd call 190 <\*ABS\*\+0x198@plt> + +[a-f0-9]+: f2 c3 bnd ret * #pass diff --git a/ld/testsuite/ld-x86-64/bnd-ifunc-1.d b/ld/testsuite/ld-x86-64/bnd-ifunc-1.d index f62a977..86453f1 100644 --- a/ld/testsuite/ld-x86-64/bnd-ifunc-1.d +++ b/ld/testsuite/ld-x86-64/bnd-ifunc-1.d @@ -3,5 +3,5 @@ #objdump: -dw #... -[ ]*[a-f0-9]+: f2 e8 f0 ff ff ff bnd callq [a-f0-9]+ <\*ABS\*\+0x[a-f0-9]+@plt> +[ ]*[a-f0-9]+: f2 e8 f0 ff ff ff bnd call [a-f0-9]+ <\*ABS\*\+0x[a-f0-9]+@plt> #pass diff --git a/ld/testsuite/ld-x86-64/bnd-ifunc-2-now.d b/ld/testsuite/ld-x86-64/bnd-ifunc-2-now.d index 800dba0..634940d 100644 --- a/ld/testsuite/ld-x86-64/bnd-ifunc-2-now.d +++ b/ld/testsuite/ld-x86-64/bnd-ifunc-2-now.d @@ -9,51 +9,51 @@ Disassembly of section .plt: 0+240 <.plt>: - +[a-f0-9]+: ff 35 9a 01 20 00 pushq 0x20019a\(%rip\) # 2003e0 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: f2 ff 25 9b 01 20 00 bnd jmpq \*0x20019b\(%rip\) # 2003e8 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 9a 01 20 00 push 0x20019a\(%rip\) # 2003e0 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: f2 ff 25 9b 01 20 00 bnd jmp \*0x20019b\(%rip\) # 2003e8 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) - +[a-f0-9]+: 68 03 00 00 00 pushq \$0x3 - +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmpq 240 <.plt> + +[a-f0-9]+: 68 03 00 00 00 push \$0x3 + +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmp 240 <.plt> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: f2 e9 d5 ff ff ff bnd jmpq 240 <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: f2 e9 d5 ff ff ff bnd jmp 240 <.plt> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) - +[a-f0-9]+: 68 01 00 00 00 pushq \$0x1 - +[a-f0-9]+: f2 e9 c5 ff ff ff bnd jmpq 240 <.plt> + +[a-f0-9]+: 68 01 00 00 00 push \$0x1 + +[a-f0-9]+: f2 e9 c5 ff ff ff bnd jmp 240 <.plt> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) - +[a-f0-9]+: 68 02 00 00 00 pushq \$0x2 - +[a-f0-9]+: f2 e9 b5 ff ff ff bnd jmpq 240 <.plt> + +[a-f0-9]+: 68 02 00 00 00 push \$0x2 + +[a-f0-9]+: f2 e9 b5 ff ff ff bnd jmp 240 <.plt> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) Disassembly of section .plt.sec: 0+290 <\*ABS\*\+0x2bc@plt>: - +[a-f0-9]+: f2 ff 25 59 01 20 00 bnd jmpq \*0x200159\(%rip\) # 2003f0 <_GLOBAL_OFFSET_TABLE_\+0x18> + +[a-f0-9]+: f2 ff 25 59 01 20 00 bnd jmp \*0x200159\(%rip\) # 2003f0 <_GLOBAL_OFFSET_TABLE_\+0x18> +[a-f0-9]+: 90 nop 0+298 <func1@plt>: - +[a-f0-9]+: f2 ff 25 59 01 20 00 bnd jmpq \*0x200159\(%rip\) # 2003f8 <func1> + +[a-f0-9]+: f2 ff 25 59 01 20 00 bnd jmp \*0x200159\(%rip\) # 2003f8 <func1> +[a-f0-9]+: 90 nop 0+2a0 <func2@plt>: - +[a-f0-9]+: f2 ff 25 59 01 20 00 bnd jmpq \*0x200159\(%rip\) # 200400 <func2> + +[a-f0-9]+: f2 ff 25 59 01 20 00 bnd jmp \*0x200159\(%rip\) # 200400 <func2> +[a-f0-9]+: 90 nop 0+2a8 <\*ABS\*\+0x2b0@plt>: - +[a-f0-9]+: f2 ff 25 59 01 20 00 bnd jmpq \*0x200159\(%rip\) # 200408 <_GLOBAL_OFFSET_TABLE_\+0x30> + +[a-f0-9]+: f2 ff 25 59 01 20 00 bnd jmp \*0x200159\(%rip\) # 200408 <_GLOBAL_OFFSET_TABLE_\+0x30> +[a-f0-9]+: 90 nop Disassembly of section .text: 0+2b0 <resolve1>: - +[a-f0-9]+: f2 e8 e2 ff ff ff bnd callq 298 <func1@plt> + +[a-f0-9]+: f2 e8 e2 ff ff ff bnd call 298 <func1@plt> 0+2b6 <g1>: - +[a-f0-9]+: f2 e9 ec ff ff ff bnd jmpq 2a8 <\*ABS\*\+0x2b0@plt> + +[a-f0-9]+: f2 e9 ec ff ff ff bnd jmp 2a8 <\*ABS\*\+0x2b0@plt> 0+2bc <resolve2>: - +[a-f0-9]+: f2 e8 de ff ff ff bnd callq 2a0 <func2@plt> + +[a-f0-9]+: f2 e8 de ff ff ff bnd call 2a0 <func2@plt> 0+2c2 <g2>: - +[a-f0-9]+: f2 e9 c8 ff ff ff bnd jmpq 290 <\*ABS\*\+0x2bc@plt> + +[a-f0-9]+: f2 e9 c8 ff ff ff bnd jmp 290 <\*ABS\*\+0x2bc@plt> #pass diff --git a/ld/testsuite/ld-x86-64/bnd-ifunc-2.d b/ld/testsuite/ld-x86-64/bnd-ifunc-2.d index 4df7156..7a0356c 100644 --- a/ld/testsuite/ld-x86-64/bnd-ifunc-2.d +++ b/ld/testsuite/ld-x86-64/bnd-ifunc-2.d @@ -4,51 +4,51 @@ #... 0+240 <.plt>: -[ ]*[a-f0-9]+: ff 35 7a 01 20 00 pushq 0x20017a\(%rip\)[ ]*(#.*)? -[ ]*[a-f0-9]+: f2 ff 25 7b 01 20 00 bnd jmpq \*0x20017b\(%rip\)[ ]*(#.*)? +[ ]*[a-f0-9]+: ff 35 7a 01 20 00 push 0x20017a\(%rip\)[ ]*(#.*)? +[ ]*[a-f0-9]+: f2 ff 25 7b 01 20 00 bnd jmp \*0x20017b\(%rip\)[ ]*(#.*)? [ ]*[a-f0-9]+: 0f 1f 00 nopl \(%rax\) -[ ]*[a-f0-9]+: 68 03 00 00 00 pushq \$0x3 -[ ]*[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmpq 240 <.plt> +[ ]*[a-f0-9]+: 68 03 00 00 00 push \$0x3 +[ ]*[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmp 240 <.plt> [ ]*[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) -[ ]*[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 -[ ]*[a-f0-9]+: f2 e9 d5 ff ff ff bnd jmpq 240 <.plt> +[ ]*[a-f0-9]+: 68 00 00 00 00 push \$0x0 +[ ]*[a-f0-9]+: f2 e9 d5 ff ff ff bnd jmp 240 <.plt> [ ]*[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) -[ ]*[a-f0-9]+: 68 01 00 00 00 pushq \$0x1 -[ ]*[a-f0-9]+: f2 e9 c5 ff ff ff bnd jmpq 240 <.plt> +[ ]*[a-f0-9]+: 68 01 00 00 00 push \$0x1 +[ ]*[a-f0-9]+: f2 e9 c5 ff ff ff bnd jmp 240 <.plt> [ ]*[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) -[ ]*[a-f0-9]+: 68 02 00 00 00 pushq \$0x2 -[ ]*[a-f0-9]+: f2 e9 b5 ff ff ff bnd jmpq 240 <.plt> +[ ]*[a-f0-9]+: 68 02 00 00 00 push \$0x2 +[ ]*[a-f0-9]+: f2 e9 b5 ff ff ff bnd jmp 240 <.plt> [ ]*[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) Disassembly of section .plt.sec: 0+290 <\*ABS\*\+0x2bc@plt>: -[ ]*[a-f0-9]+: f2 ff 25 39 01 20 00 bnd jmpq \*0x200139\(%rip\)[ ]*(#.*)? +[ ]*[a-f0-9]+: f2 ff 25 39 01 20 00 bnd jmp \*0x200139\(%rip\)[ ]*(#.*)? [ ]*[a-f0-9]+: 90 nop 0+298 <func1@plt>: -[ ]*[a-f0-9]+: f2 ff 25 39 01 20 00 bnd jmpq \*0x200139\(%rip\)[ ]*(#.*)? +[ ]*[a-f0-9]+: f2 ff 25 39 01 20 00 bnd jmp \*0x200139\(%rip\)[ ]*(#.*)? [ ]*[a-f0-9]+: 90 nop 0+2a0 <func2@plt>: -[ ]*[a-f0-9]+: f2 ff 25 39 01 20 00 bnd jmpq \*0x200139\(%rip\)[ ]*(#.*)? +[ ]*[a-f0-9]+: f2 ff 25 39 01 20 00 bnd jmp \*0x200139\(%rip\)[ ]*(#.*)? [ ]*[a-f0-9]+: 90 nop 0+2a8 <\*ABS\*\+0x2b0@plt>: -[ ]*[a-f0-9]+: f2 ff 25 39 01 20 00 bnd jmpq \*0x200139\(%rip\)[ ]*(#.*)? +[ ]*[a-f0-9]+: f2 ff 25 39 01 20 00 bnd jmp \*0x200139\(%rip\)[ ]*(#.*)? [ ]*[a-f0-9]+: 90 nop Disassembly of section .text: 0+2b0 <resolve1>: -[ ]*[a-f0-9]+: f2 e8 e2 ff ff ff bnd callq 298 <func1@plt> +[ ]*[a-f0-9]+: f2 e8 e2 ff ff ff bnd call 298 <func1@plt> 0+2b6 <g1>: -[ ]*[a-f0-9]+: f2 e9 ec ff ff ff bnd jmpq 2a8 <\*ABS\*\+0x2b0@plt> +[ ]*[a-f0-9]+: f2 e9 ec ff ff ff bnd jmp 2a8 <\*ABS\*\+0x2b0@plt> 0+2bc <resolve2>: -[ ]*[a-f0-9]+: f2 e8 de ff ff ff bnd callq 2a0 <func2@plt> +[ ]*[a-f0-9]+: f2 e8 de ff ff ff bnd call 2a0 <func2@plt> 0+2c2 <g2>: -[ ]*[a-f0-9]+: f2 e9 c8 ff ff ff bnd jmpq 290 <\*ABS\*\+0x2bc@plt> +[ ]*[a-f0-9]+: f2 e9 c8 ff ff ff bnd jmp 290 <\*ABS\*\+0x2bc@plt> #pass diff --git a/ld/testsuite/ld-x86-64/bnd-plt-1-now.d b/ld/testsuite/ld-x86-64/bnd-plt-1-now.d index 1d4d8eb..be5392c 100644 --- a/ld/testsuite/ld-x86-64/bnd-plt-1-now.d +++ b/ld/testsuite/ld-x86-64/bnd-plt-1-now.d @@ -9,47 +9,47 @@ Disassembly of section .plt: 0+230 <.plt>: - +[a-f0-9]+: ff 35 a2 01 20 00 pushq 0x2001a2\(%rip\) # 2003d8 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: f2 ff 25 a3 01 20 00 bnd jmpq \*0x2001a3\(%rip\) # 2003e0 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 a2 01 20 00 push 0x2001a2\(%rip\) # 2003d8 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: f2 ff 25 a3 01 20 00 bnd jmp \*0x2001a3\(%rip\) # 2003e0 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmpq 230 <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmp 230 <.plt> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) - +[a-f0-9]+: 68 01 00 00 00 pushq \$0x1 - +[a-f0-9]+: f2 e9 d5 ff ff ff bnd jmpq 230 <.plt> + +[a-f0-9]+: 68 01 00 00 00 push \$0x1 + +[a-f0-9]+: f2 e9 d5 ff ff ff bnd jmp 230 <.plt> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) - +[a-f0-9]+: 68 02 00 00 00 pushq \$0x2 - +[a-f0-9]+: f2 e9 c5 ff ff ff bnd jmpq 230 <.plt> + +[a-f0-9]+: 68 02 00 00 00 push \$0x2 + +[a-f0-9]+: f2 e9 c5 ff ff ff bnd jmp 230 <.plt> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) - +[a-f0-9]+: 68 03 00 00 00 pushq \$0x3 - +[a-f0-9]+: f2 e9 b5 ff ff ff bnd jmpq 230 <.plt> + +[a-f0-9]+: 68 03 00 00 00 push \$0x3 + +[a-f0-9]+: f2 e9 b5 ff ff ff bnd jmp 230 <.plt> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) Disassembly of section .plt.sec: 0+280 <foo2@plt>: - +[a-f0-9]+: f2 ff 25 61 01 20 00 bnd jmpq \*0x200161\(%rip\) # 2003e8 <foo2> + +[a-f0-9]+: f2 ff 25 61 01 20 00 bnd jmp \*0x200161\(%rip\) # 2003e8 <foo2> +[a-f0-9]+: 90 nop 0+288 <foo3@plt>: - +[a-f0-9]+: f2 ff 25 61 01 20 00 bnd jmpq \*0x200161\(%rip\) # 2003f0 <foo3> + +[a-f0-9]+: f2 ff 25 61 01 20 00 bnd jmp \*0x200161\(%rip\) # 2003f0 <foo3> +[a-f0-9]+: 90 nop 0+290 <foo1@plt>: - +[a-f0-9]+: f2 ff 25 61 01 20 00 bnd jmpq \*0x200161\(%rip\) # 2003f8 <foo1> + +[a-f0-9]+: f2 ff 25 61 01 20 00 bnd jmp \*0x200161\(%rip\) # 2003f8 <foo1> +[a-f0-9]+: 90 nop 0+298 <foo4@plt>: - +[a-f0-9]+: f2 ff 25 61 01 20 00 bnd jmpq \*0x200161\(%rip\) # 200400 <foo4> + +[a-f0-9]+: f2 ff 25 61 01 20 00 bnd jmp \*0x200161\(%rip\) # 200400 <foo4> +[a-f0-9]+: 90 nop Disassembly of section .text: 0+2a0 <_start>: - +[a-f0-9]+: f2 e9 ea ff ff ff bnd jmpq 290 <foo1@plt> - +[a-f0-9]+: e8 d5 ff ff ff callq 280 <foo2@plt> - +[a-f0-9]+: e9 d8 ff ff ff jmpq 288 <foo3@plt> - +[a-f0-9]+: e8 e3 ff ff ff callq 298 <foo4@plt> - +[a-f0-9]+: f2 e8 cd ff ff ff bnd callq 288 <foo3@plt> - +[a-f0-9]+: e9 d8 ff ff ff jmpq 298 <foo4@plt> + +[a-f0-9]+: f2 e9 ea ff ff ff bnd jmp 290 <foo1@plt> + +[a-f0-9]+: e8 d5 ff ff ff call 280 <foo2@plt> + +[a-f0-9]+: e9 d8 ff ff ff jmp 288 <foo3@plt> + +[a-f0-9]+: e8 e3 ff ff ff call 298 <foo4@plt> + +[a-f0-9]+: f2 e8 cd ff ff ff bnd call 288 <foo3@plt> + +[a-f0-9]+: e9 d8 ff ff ff jmp 298 <foo4@plt> #pass diff --git a/ld/testsuite/ld-x86-64/bnd-plt-1.d b/ld/testsuite/ld-x86-64/bnd-plt-1.d index bd10b6c..cca3705 100644 --- a/ld/testsuite/ld-x86-64/bnd-plt-1.d +++ b/ld/testsuite/ld-x86-64/bnd-plt-1.d @@ -9,47 +9,47 @@ Disassembly of section .plt: 0+230 <.plt>: -[ ]*[a-f0-9]+: ff 35 82 01 20 00 pushq 0x200182\(%rip\)[ ]*(#.*)? -[ ]*[a-f0-9]+: f2 ff 25 83 01 20 00 bnd jmpq \*0x200183\(%rip\)[ ]*(#.*)? +[ ]*[a-f0-9]+: ff 35 82 01 20 00 push 0x200182\(%rip\)[ ]*(#.*)? +[ ]*[a-f0-9]+: f2 ff 25 83 01 20 00 bnd jmp \*0x200183\(%rip\)[ ]*(#.*)? [ ]*[a-f0-9]+: 0f 1f 00 nopl \(%rax\) -[ ]*[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 -[ ]*[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmpq 230 <.plt> +[ ]*[a-f0-9]+: 68 00 00 00 00 push \$0x0 +[ ]*[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmp 230 <.plt> [ ]*[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) -[ ]*[a-f0-9]+: 68 01 00 00 00 pushq \$0x1 -[ ]*[a-f0-9]+: f2 e9 d5 ff ff ff bnd jmpq 230 <.plt> +[ ]*[a-f0-9]+: 68 01 00 00 00 push \$0x1 +[ ]*[a-f0-9]+: f2 e9 d5 ff ff ff bnd jmp 230 <.plt> [ ]*[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) -[ ]*[a-f0-9]+: 68 02 00 00 00 pushq \$0x2 -[ ]*[a-f0-9]+: f2 e9 c5 ff ff ff bnd jmpq 230 <.plt> +[ ]*[a-f0-9]+: 68 02 00 00 00 push \$0x2 +[ ]*[a-f0-9]+: f2 e9 c5 ff ff ff bnd jmp 230 <.plt> [ ]*[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) -[ ]*[a-f0-9]+: 68 03 00 00 00 pushq \$0x3 -[ ]*[a-f0-9]+: f2 e9 b5 ff ff ff bnd jmpq 230 <.plt> +[ ]*[a-f0-9]+: 68 03 00 00 00 push \$0x3 +[ ]*[a-f0-9]+: f2 e9 b5 ff ff ff bnd jmp 230 <.plt> [ ]*[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) Disassembly of section .plt.sec: 0+280 <foo2@plt>: -[ ]*[a-f0-9]+: f2 ff 25 41 01 20 00 bnd jmpq \*0x200141\(%rip\)[ ]*(#.*)? +[ ]*[a-f0-9]+: f2 ff 25 41 01 20 00 bnd jmp \*0x200141\(%rip\)[ ]*(#.*)? [ ]*[a-f0-9]+: 90 nop 0+288 <foo3@plt>: -[ ]*[a-f0-9]+: f2 ff 25 41 01 20 00 bnd jmpq \*0x200141\(%rip\)[ ]*(#.*)? +[ ]*[a-f0-9]+: f2 ff 25 41 01 20 00 bnd jmp \*0x200141\(%rip\)[ ]*(#.*)? [ ]*[a-f0-9]+: 90 nop 0+290 <foo1@plt>: -[ ]*[a-f0-9]+: f2 ff 25 41 01 20 00 bnd jmpq \*0x200141\(%rip\)[ ]*(#.*)? +[ ]*[a-f0-9]+: f2 ff 25 41 01 20 00 bnd jmp \*0x200141\(%rip\)[ ]*(#.*)? [ ]*[a-f0-9]+: 90 nop 0+298 <foo4@plt>: -[ ]*[a-f0-9]+: f2 ff 25 41 01 20 00 bnd jmpq \*0x200141\(%rip\)[ ]*(#.*)? +[ ]*[a-f0-9]+: f2 ff 25 41 01 20 00 bnd jmp \*0x200141\(%rip\)[ ]*(#.*)? [ ]*[a-f0-9]+: 90 nop Disassembly of section .text: 0+2a0 <_start>: -[ ]*[a-f0-9]+: f2 e9 ea ff ff ff bnd jmpq 290 <foo1@plt> -[ ]*[a-f0-9]+: e8 d5 ff ff ff callq 280 <foo2@plt> -[ ]*[a-f0-9]+: e9 d8 ff ff ff jmpq 288 <foo3@plt> -[ ]*[a-f0-9]+: e8 e3 ff ff ff callq 298 <foo4@plt> -[ ]*[a-f0-9]+: f2 e8 cd ff ff ff bnd callq 288 <foo3@plt> -[ ]*[a-f0-9]+: e9 d8 ff ff ff jmpq 298 <foo4@plt> +[ ]*[a-f0-9]+: f2 e9 ea ff ff ff bnd jmp 290 <foo1@plt> +[ ]*[a-f0-9]+: e8 d5 ff ff ff call 280 <foo2@plt> +[ ]*[a-f0-9]+: e9 d8 ff ff ff jmp 288 <foo3@plt> +[ ]*[a-f0-9]+: e8 e3 ff ff ff call 298 <foo4@plt> +[ ]*[a-f0-9]+: f2 e8 cd ff ff ff bnd call 288 <foo3@plt> +[ ]*[a-f0-9]+: e9 d8 ff ff ff jmp 298 <foo4@plt> #pass diff --git a/ld/testsuite/ld-x86-64/call1a.d b/ld/testsuite/ld-x86-64/call1a.d index 2b131ee..36e1f10 100644 --- a/ld/testsuite/ld-x86-64/call1a.d +++ b/ld/testsuite/ld-x86-64/call1a.d @@ -9,5 +9,5 @@ Disassembly of section .text: #... -[ ]*[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4} * addr32 callq +[a-f0-9]+ <foo> +[ ]*[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4} * addr32 call +[a-f0-9]+ <foo> #pass diff --git a/ld/testsuite/ld-x86-64/call1b.d b/ld/testsuite/ld-x86-64/call1b.d index e2fef07..644ded4 100644 --- a/ld/testsuite/ld-x86-64/call1b.d +++ b/ld/testsuite/ld-x86-64/call1b.d @@ -9,5 +9,5 @@ Disassembly of section .text: #... -[ ]*[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4} * addr32 callq +[a-f0-9]+ <foo> +[ ]*[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4} * addr32 call +[a-f0-9]+ <foo> #pass diff --git a/ld/testsuite/ld-x86-64/call1d.d b/ld/testsuite/ld-x86-64/call1d.d index c93756b..e22cc99 100644 --- a/ld/testsuite/ld-x86-64/call1d.d +++ b/ld/testsuite/ld-x86-64/call1d.d @@ -9,6 +9,6 @@ Disassembly of section .text: #... -[ ]*[a-f0-9]+: e8 ([0-9a-f]{2} ){4} * callq +[a-f0-9]+ <foo> +[ ]*[a-f0-9]+: e8 ([0-9a-f]{2} ){4} * call +[a-f0-9]+ <foo> [ ]*[a-f0-9]+: 90 nop #pass diff --git a/ld/testsuite/ld-x86-64/call1e.d b/ld/testsuite/ld-x86-64/call1e.d index c7c467c..cd1641d 100644 --- a/ld/testsuite/ld-x86-64/call1e.d +++ b/ld/testsuite/ld-x86-64/call1e.d @@ -9,5 +9,5 @@ Disassembly of section .text: #... -[ ]*[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4} * addr32 callq +[a-f0-9]+ <foo> +[ ]*[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4} * addr32 call +[a-f0-9]+ <foo> #pass diff --git a/ld/testsuite/ld-x86-64/call1f.d b/ld/testsuite/ld-x86-64/call1f.d index d0c3f11..efa01b5 100644 --- a/ld/testsuite/ld-x86-64/call1f.d +++ b/ld/testsuite/ld-x86-64/call1f.d @@ -10,5 +10,5 @@ Disassembly of section .text: #... [ ]*[a-f0-9]+: 90 nop -[ ]*[a-f0-9]+: e8 ([0-9a-f]{2} ){4} * callq +[a-f0-9]+ <foo> +[ ]*[a-f0-9]+: e8 ([0-9a-f]{2} ){4} * call +[a-f0-9]+ <foo> #pass diff --git a/ld/testsuite/ld-x86-64/call1g.d b/ld/testsuite/ld-x86-64/call1g.d index 6a8d790..44dd77f 100644 --- a/ld/testsuite/ld-x86-64/call1g.d +++ b/ld/testsuite/ld-x86-64/call1g.d @@ -9,6 +9,6 @@ Disassembly of section .text: #... -[ ]*[a-f0-9]+: e8 ([0-9a-f]{2} ){4} * callq +[a-f0-9]+ <foo> +[ ]*[a-f0-9]+: e8 ([0-9a-f]{2} ){4} * call +[a-f0-9]+ <foo> [ ]*[a-f0-9]+: 90 nop #pass diff --git a/ld/testsuite/ld-x86-64/call1h.d b/ld/testsuite/ld-x86-64/call1h.d index f8e1d07..de1abbb 100644 --- a/ld/testsuite/ld-x86-64/call1h.d +++ b/ld/testsuite/ld-x86-64/call1h.d @@ -9,6 +9,6 @@ Disassembly of section .text: #... -[ ]*[a-f0-9]+: e8 ([0-9a-f]{2} ){4} * callq +[a-f0-9]+ <foo> +[ ]*[a-f0-9]+: e8 ([0-9a-f]{2} ){4} * call +[a-f0-9]+ <foo> [ ]*[a-f0-9]+: 90 nop #pass diff --git a/ld/testsuite/ld-x86-64/call1i.d b/ld/testsuite/ld-x86-64/call1i.d index d5a157b..ce95bfc 100644 --- a/ld/testsuite/ld-x86-64/call1i.d +++ b/ld/testsuite/ld-x86-64/call1i.d @@ -9,6 +9,6 @@ Disassembly of section .text: #... -[ ]*[a-f0-9]+: e8 ([0-9a-f]{2} ){4} * callq +[a-f0-9]+ <foo> +[ ]*[a-f0-9]+: e8 ([0-9a-f]{2} ){4} * call +[a-f0-9]+ <foo> [ ]*[a-f0-9]+: 90 nop #pass diff --git a/ld/testsuite/ld-x86-64/gotpcrel1.dd b/ld/testsuite/ld-x86-64/gotpcrel1.dd index 58450bd..04e7049 100644 --- a/ld/testsuite/ld-x86-64/gotpcrel1.dd +++ b/ld/testsuite/ld-x86-64/gotpcrel1.dd @@ -1,17 +1,17 @@ #... [a-f0-9]+ <main>: [ ]*[a-f0-9]+: 48 83 ec 08 sub \$0x8,%rsp -[ ]*[a-f0-9]+: [ a-f0-9]+ addr32 callq [a-f0-9]+ <foo> -[ ]*[a-f0-9]+: [ a-f0-9]+ callq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <.*> -[ ]*[a-f0-9]+: [ a-f0-9]+ callq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <.*> +[ ]*[a-f0-9]+: [ a-f0-9]+ addr32 call [a-f0-9]+ <foo> +[ ]*[a-f0-9]+: [ a-f0-9]+ call \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <.*> +[ ]*[a-f0-9]+: [ a-f0-9]+ call \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <.*> [ ]*[a-f0-9]+: [ a-f0-9]+ (rex mov|mov ) \$0x[a-f0-9]+,%(r|e)ax -[ ]*[a-f0-9]+: ff d0 callq \*%rax +[ ]*[a-f0-9]+: ff d0 call \*%rax [ ]*[a-f0-9]+: [ a-f0-9]+ mov 0x[a-f0-9]+\(%rip\),%rcx # [a-f0-9]+ <.*> -[ ]*[a-f0-9]+: ff d1 callq \*%rcx +[ ]*[a-f0-9]+: ff d1 call \*%rcx [ ]*[a-f0-9]+: [ a-f0-9]+ mov 0x[a-f0-9]+\(%rip\),%rdx # [a-f0-9]+ <.*> -[ ]*[a-f0-9]+: ff d2 callq \*%rdx +[ ]*[a-f0-9]+: ff d2 call \*%rdx [ ]*[a-f0-9]+: 31 ff xor %edi,%edi [ ]*[a-f0-9]+: 48 83 c4 08 add \$0x8,%rsp -[ ]*[a-f0-9]+: [ a-f0-9]+ jmpq [a-f0-9]+ <myexit> +[ ]*[a-f0-9]+: [ a-f0-9]+ jmp [a-f0-9]+ <myexit> [ ]*[a-f0-9]+: 90 nop #pass diff --git a/ld/testsuite/ld-x86-64/hidden2.d b/ld/testsuite/ld-x86-64/hidden2.d index d51c2fb..4628aa2 100644 --- 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 ([0-9a-f]{2} ){4} * callq 0 .* -[ ]*[a-f0-9]+: c3 retq * +[ ]*[a-f0-9]+: e8 ([0-9a-f]{2} ){4} * call 0 .* +[ ]*[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/ibt-plt-1-x32.d b/ld/testsuite/ld-x86-64/ibt-plt-1-x32.d index f0a2b92..2018b11 100644 --- a/ld/testsuite/ld-x86-64/ibt-plt-1-x32.d +++ b/ld/testsuite/ld-x86-64/ibt-plt-1-x32.d @@ -9,35 +9,35 @@ Disassembly of section .plt: [a-f0-9]+ <.plt>: - +[a-f0-9]+: ff 35 ([0-9a-f]{2} ){4}[ ]+pushq 0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 ([0-9a-f]{2} ){4}[ ]+push 0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: e9 e2 ff ff ff jmpq [a-f0-9]+ <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: e9 e2 ff ff ff jmp [a-f0-9]+ <.plt> +[a-f0-9]+: 66 90 xchg %ax,%ax +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 01 00 00 00 pushq \$0x1 - +[a-f0-9]+: e9 d2 ff ff ff jmpq [a-f0-9]+ <.plt> + +[a-f0-9]+: 68 01 00 00 00 push \$0x1 + +[a-f0-9]+: e9 d2 ff ff ff jmp [a-f0-9]+ <.plt> +[a-f0-9]+: 66 90 xchg %ax,%ax Disassembly of section .plt.sec: [a-f0-9]+ <bar1@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar1> + +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar1> +[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%rax,%rax,1\) [a-f0-9]+ <bar2@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar2> + +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar2> +[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%rax,%rax,1\) Disassembly of section .text: [a-f0-9]+ <foo>: +[a-f0-9]+: 48 83 ec 08 sub \$0x8,%rsp - +[a-f0-9]+: e8 e7 ff ff ff callq [a-f0-9]+ <bar2@plt> + +[a-f0-9]+: e8 e7 ff ff ff call [a-f0-9]+ <bar2@plt> +[a-f0-9]+: 48 83 c4 08 add \$0x8,%rsp - +[a-f0-9]+: e9 ce ff ff ff jmpq [a-f0-9]+ <bar1@plt> + +[a-f0-9]+: e9 ce ff ff ff jmp [a-f0-9]+ <bar1@plt> #pass diff --git a/ld/testsuite/ld-x86-64/ibt-plt-1.d b/ld/testsuite/ld-x86-64/ibt-plt-1.d index a4064c6..d556ec1 100644 --- a/ld/testsuite/ld-x86-64/ibt-plt-1.d +++ b/ld/testsuite/ld-x86-64/ibt-plt-1.d @@ -9,35 +9,35 @@ Disassembly of section .plt: [a-f0-9]+ <.plt>: - +[a-f0-9]+: ff 35 ([0-9a-f]{2} ){4}[ ]+pushq 0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: f2 ff 25 ([0-9a-f]{2} ){4}[ ]+bnd jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 ([0-9a-f]{2} ){4}[ ]+push 0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: f2 ff 25 ([0-9a-f]{2} ){4}[ ]+bnd jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: f2 e9 e1 ff ff ff bnd jmpq [a-f0-9]+ <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: f2 e9 e1 ff ff ff bnd jmp [a-f0-9]+ <.plt> +[a-f0-9]+: 90 nop +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 01 00 00 00 pushq \$0x1 - +[a-f0-9]+: f2 e9 d1 ff ff ff bnd jmpq [a-f0-9]+ <.plt> + +[a-f0-9]+: 68 01 00 00 00 push \$0x1 + +[a-f0-9]+: f2 e9 d1 ff ff ff bnd jmp [a-f0-9]+ <.plt> +[a-f0-9]+: 90 nop Disassembly of section .plt.sec: [a-f0-9]+ <bar1@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: f2 ff 25 ([0-9a-f]{2} ){4}[ ]+bnd jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar1> + +[a-f0-9]+: f2 ff 25 ([0-9a-f]{2} ){4}[ ]+bnd jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar1> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) [a-f0-9]+ <bar2@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: f2 ff 25 ([0-9a-f]{2} ){4}[ ]+bnd jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar2> + +[a-f0-9]+: f2 ff 25 ([0-9a-f]{2} ){4}[ ]+bnd jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar2> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) Disassembly of section .text: [a-f0-9]+ <foo>: +[a-f0-9]+: 48 83 ec 08 sub \$0x8,%rsp - +[a-f0-9]+: e8 e7 ff ff ff callq [a-f0-9]+ <bar2@plt> + +[a-f0-9]+: e8 e7 ff ff ff call [a-f0-9]+ <bar2@plt> +[a-f0-9]+: 48 83 c4 08 add \$0x8,%rsp - +[a-f0-9]+: e9 ce ff ff ff jmpq [a-f0-9]+ <bar1@plt> + +[a-f0-9]+: e9 ce ff ff ff jmp [a-f0-9]+ <bar1@plt> #pass diff --git a/ld/testsuite/ld-x86-64/ibt-plt-2a-x32.d b/ld/testsuite/ld-x86-64/ibt-plt-2a-x32.d index 7058563..5168a31 100644 --- a/ld/testsuite/ld-x86-64/ibt-plt-2a-x32.d +++ b/ld/testsuite/ld-x86-64/ibt-plt-2a-x32.d @@ -9,35 +9,35 @@ Disassembly of section .plt: 0+140 <.plt>: - +[a-f0-9]+: ff 35 4a 01 20 00 pushq 0x20014a\(%rip\) # 200290 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: ff 25 4c 01 20 00 jmpq \*0x20014c\(%rip\) # 200298 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 4a 01 20 00 push 0x20014a\(%rip\) # 200290 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: ff 25 4c 01 20 00 jmp \*0x20014c\(%rip\) # 200298 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: e9 e2 ff ff ff jmpq 140 <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: e9 e2 ff ff ff jmp 140 <.plt> +[a-f0-9]+: 66 90 xchg %ax,%ax +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 01 00 00 00 pushq \$0x1 - +[a-f0-9]+: e9 d2 ff ff ff jmpq 140 <.plt> + +[a-f0-9]+: 68 01 00 00 00 push \$0x1 + +[a-f0-9]+: e9 d2 ff ff ff jmp 140 <.plt> +[a-f0-9]+: 66 90 xchg %ax,%ax Disassembly of section .plt.sec: 0+170 <bar1@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: ff 25 26 01 20 00 jmpq \*0x200126\(%rip\) # 2002a0 <bar1> + +[a-f0-9]+: ff 25 26 01 20 00 jmp \*0x200126\(%rip\) # 2002a0 <bar1> +[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%rax,%rax,1\) 0+180 <bar2@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: ff 25 1e 01 20 00 jmpq \*0x20011e\(%rip\) # 2002a8 <bar2> + +[a-f0-9]+: ff 25 1e 01 20 00 jmp \*0x20011e\(%rip\) # 2002a8 <bar2> +[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%rax,%rax,1\) Disassembly of section .text: 0+190 <foo>: +[a-f0-9]+: 48 83 ec 08 sub \$0x8,%rsp - +[a-f0-9]+: e8 e7 ff ff ff callq 180 <bar2@plt> + +[a-f0-9]+: e8 e7 ff ff ff call 180 <bar2@plt> +[a-f0-9]+: 48 83 c4 08 add \$0x8,%rsp - +[a-f0-9]+: e9 ce ff ff ff jmpq 170 <bar1@plt> + +[a-f0-9]+: e9 ce ff ff ff jmp 170 <bar1@plt> #pass diff --git a/ld/testsuite/ld-x86-64/ibt-plt-2a.d b/ld/testsuite/ld-x86-64/ibt-plt-2a.d index 0894354..01401ba 100644 --- a/ld/testsuite/ld-x86-64/ibt-plt-2a.d +++ b/ld/testsuite/ld-x86-64/ibt-plt-2a.d @@ -9,35 +9,35 @@ Disassembly of section .plt: 0+1f0 <.plt>: - +[a-f0-9]+: ff 35 ca 01 20 00 pushq 0x2001ca\(%rip\) # 2003c0 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: f2 ff 25 cb 01 20 00 bnd jmpq \*0x2001cb\(%rip\) # 2003c8 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 ca 01 20 00 push 0x2001ca\(%rip\) # 2003c0 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: f2 ff 25 cb 01 20 00 bnd jmp \*0x2001cb\(%rip\) # 2003c8 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: f2 e9 e1 ff ff ff bnd jmpq 1f0 <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: f2 e9 e1 ff ff ff bnd jmp 1f0 <.plt> +[a-f0-9]+: 90 nop +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 01 00 00 00 pushq \$0x1 - +[a-f0-9]+: f2 e9 d1 ff ff ff bnd jmpq 1f0 <.plt> + +[a-f0-9]+: 68 01 00 00 00 push \$0x1 + +[a-f0-9]+: f2 e9 d1 ff ff ff bnd jmp 1f0 <.plt> +[a-f0-9]+: 90 nop Disassembly of section .plt.sec: 0+220 <bar1@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: f2 ff 25 a5 01 20 00 bnd jmpq \*0x2001a5\(%rip\) # 2003d0 <bar1> + +[a-f0-9]+: f2 ff 25 a5 01 20 00 bnd jmp \*0x2001a5\(%rip\) # 2003d0 <bar1> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) 0+230 <bar2@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: f2 ff 25 9d 01 20 00 bnd jmpq \*0x20019d\(%rip\) # 2003d8 <bar2> + +[a-f0-9]+: f2 ff 25 9d 01 20 00 bnd jmp \*0x20019d\(%rip\) # 2003d8 <bar2> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) Disassembly of section .text: 0+240 <foo>: +[a-f0-9]+: 48 83 ec 08 sub \$0x8,%rsp - +[a-f0-9]+: e8 e7 ff ff ff callq 230 <bar2@plt> + +[a-f0-9]+: e8 e7 ff ff ff call 230 <bar2@plt> +[a-f0-9]+: 48 83 c4 08 add \$0x8,%rsp - +[a-f0-9]+: e9 ce ff ff ff jmpq 220 <bar1@plt> + +[a-f0-9]+: e9 ce ff ff ff jmp 220 <bar1@plt> #pass diff --git a/ld/testsuite/ld-x86-64/ibt-plt-2c-x32.d b/ld/testsuite/ld-x86-64/ibt-plt-2c-x32.d index 50b8fb1..9f9663c 100644 --- a/ld/testsuite/ld-x86-64/ibt-plt-2c-x32.d +++ b/ld/testsuite/ld-x86-64/ibt-plt-2c-x32.d @@ -9,35 +9,35 @@ Disassembly of section .plt: [a-f0-9]+ <.plt>: - +[a-f0-9]+: ff 35 ([0-9a-f]{2} ){4}[ ]+pushq 0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 ([0-9a-f]{2} ){4}[ ]+push 0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: e9 e2 ff ff ff jmpq [a-f0-9]+ <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: e9 e2 ff ff ff jmp [a-f0-9]+ <.plt> +[a-f0-9]+: 66 90 xchg %ax,%ax +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 01 00 00 00 pushq \$0x1 - +[a-f0-9]+: e9 d2 ff ff ff jmpq [a-f0-9]+ <.plt> + +[a-f0-9]+: 68 01 00 00 00 push \$0x1 + +[a-f0-9]+: e9 d2 ff ff ff jmp [a-f0-9]+ <.plt> +[a-f0-9]+: 66 90 xchg %ax,%ax Disassembly of section .plt.sec: [a-f0-9]+ <bar1@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar1> + +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar1> +[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%rax,%rax,1\) [a-f0-9]+ <bar2@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar2> + +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar2> +[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%rax,%rax,1\) Disassembly of section .text: [a-f0-9]+ <foo>: +[a-f0-9]+: 48 83 ec 08 sub \$0x8,%rsp - +[a-f0-9]+: e8 e7 ff ff ff callq [a-f0-9]+ <bar2@plt> + +[a-f0-9]+: e8 e7 ff ff ff call [a-f0-9]+ <bar2@plt> +[a-f0-9]+: 48 83 c4 08 add \$0x8,%rsp - +[a-f0-9]+: e9 ce ff ff ff jmpq [a-f0-9]+ <bar1@plt> + +[a-f0-9]+: e9 ce ff ff ff jmp [a-f0-9]+ <bar1@plt> #pass diff --git a/ld/testsuite/ld-x86-64/ibt-plt-2c.d b/ld/testsuite/ld-x86-64/ibt-plt-2c.d index ce1885e..aa81fb9 100644 --- a/ld/testsuite/ld-x86-64/ibt-plt-2c.d +++ b/ld/testsuite/ld-x86-64/ibt-plt-2c.d @@ -9,35 +9,35 @@ Disassembly of section .plt: [a-f0-9]+ <.plt>: - +[a-f0-9]+: ff 35 ([0-9a-f]{2} ){4}[ ]+pushq 0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: f2 ff 25 ([0-9a-f]{2} ){4}[ ]+bnd jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 ([0-9a-f]{2} ){4}[ ]+push 0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: f2 ff 25 ([0-9a-f]{2} ){4}[ ]+bnd jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: f2 e9 e1 ff ff ff bnd jmpq [a-f0-9]+ <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: f2 e9 e1 ff ff ff bnd jmp [a-f0-9]+ <.plt> +[a-f0-9]+: 90 nop +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 01 00 00 00 pushq \$0x1 - +[a-f0-9]+: f2 e9 d1 ff ff ff bnd jmpq [a-f0-9]+ <.plt> + +[a-f0-9]+: 68 01 00 00 00 push \$0x1 + +[a-f0-9]+: f2 e9 d1 ff ff ff bnd jmp [a-f0-9]+ <.plt> +[a-f0-9]+: 90 nop Disassembly of section .plt.sec: [a-f0-9]+ <bar1@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: f2 ff 25 ([0-9a-f]{2} ){4}[ ]+bnd jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar1> + +[a-f0-9]+: f2 ff 25 ([0-9a-f]{2} ){4}[ ]+bnd jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar1> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) [a-f0-9]+ <bar2@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: f2 ff 25 ([0-9a-f]{2} ){4}[ ]+bnd jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar2> + +[a-f0-9]+: f2 ff 25 ([0-9a-f]{2} ){4}[ ]+bnd jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar2> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) Disassembly of section .text: [a-f0-9]+ <foo>: +[a-f0-9]+: 48 83 ec 08 sub \$0x8,%rsp - +[a-f0-9]+: e8 e7 ff ff ff callq [a-f0-9]+ <bar2@plt> + +[a-f0-9]+: e8 e7 ff ff ff call [a-f0-9]+ <bar2@plt> +[a-f0-9]+: 48 83 c4 08 add \$0x8,%rsp - +[a-f0-9]+: e9 ce ff ff ff jmpq [a-f0-9]+ <bar1@plt> + +[a-f0-9]+: e9 ce ff ff ff jmp [a-f0-9]+ <bar1@plt> #pass diff --git a/ld/testsuite/ld-x86-64/ibt-plt-3a-x32.d b/ld/testsuite/ld-x86-64/ibt-plt-3a-x32.d index 6b1b58d..bf185d5 100644 --- a/ld/testsuite/ld-x86-64/ibt-plt-3a-x32.d +++ b/ld/testsuite/ld-x86-64/ibt-plt-3a-x32.d @@ -9,35 +9,35 @@ Disassembly of section .plt: 0+140 <.plt>: - +[a-f0-9]+: ff 35 4a 01 20 00 pushq 0x20014a\(%rip\) # 200290 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: ff 25 4c 01 20 00 jmpq \*0x20014c\(%rip\) # 200298 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 4a 01 20 00 push 0x20014a\(%rip\) # 200290 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: ff 25 4c 01 20 00 jmp \*0x20014c\(%rip\) # 200298 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: e9 e2 ff ff ff jmpq 140 <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: e9 e2 ff ff ff jmp 140 <.plt> +[a-f0-9]+: 66 90 xchg %ax,%ax +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 01 00 00 00 pushq \$0x1 - +[a-f0-9]+: e9 d2 ff ff ff jmpq 140 <.plt> + +[a-f0-9]+: 68 01 00 00 00 push \$0x1 + +[a-f0-9]+: e9 d2 ff ff ff jmp 140 <.plt> +[a-f0-9]+: 66 90 xchg %ax,%ax Disassembly of section .plt.sec: 0+170 <bar1@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: ff 25 26 01 20 00 jmpq \*0x200126\(%rip\) # 2002a0 <bar1> + +[a-f0-9]+: ff 25 26 01 20 00 jmp \*0x200126\(%rip\) # 2002a0 <bar1> +[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%rax,%rax,1\) 0+180 <bar2@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: ff 25 1e 01 20 00 jmpq \*0x20011e\(%rip\) # 2002a8 <bar2> + +[a-f0-9]+: ff 25 1e 01 20 00 jmp \*0x20011e\(%rip\) # 2002a8 <bar2> +[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%rax,%rax,1\) Disassembly of section .text: 0+190 <foo>: +[a-f0-9]+: 48 83 ec 08 sub \$0x8,%rsp - +[a-f0-9]+: e8 e7 ff ff ff callq 180 <bar2@plt> + +[a-f0-9]+: e8 e7 ff ff ff call 180 <bar2@plt> +[a-f0-9]+: 48 83 c4 08 add \$0x8,%rsp - +[a-f0-9]+: e9 ce ff ff ff jmpq 170 <bar1@plt> + +[a-f0-9]+: e9 ce ff ff ff jmp 170 <bar1@plt> #pass diff --git a/ld/testsuite/ld-x86-64/ibt-plt-3a.d b/ld/testsuite/ld-x86-64/ibt-plt-3a.d index c365f70..27dd93c 100644 --- a/ld/testsuite/ld-x86-64/ibt-plt-3a.d +++ b/ld/testsuite/ld-x86-64/ibt-plt-3a.d @@ -9,35 +9,35 @@ Disassembly of section .plt: 0+1f0 <.plt>: - +[a-f0-9]+: ff 35 ca 01 20 00 pushq 0x2001ca\(%rip\) # 2003c0 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: f2 ff 25 cb 01 20 00 bnd jmpq \*0x2001cb\(%rip\) # 2003c8 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 ca 01 20 00 push 0x2001ca\(%rip\) # 2003c0 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: f2 ff 25 cb 01 20 00 bnd jmp \*0x2001cb\(%rip\) # 2003c8 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: f2 e9 e1 ff ff ff bnd jmpq 1f0 <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: f2 e9 e1 ff ff ff bnd jmp 1f0 <.plt> +[a-f0-9]+: 90 nop +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 01 00 00 00 pushq \$0x1 - +[a-f0-9]+: f2 e9 d1 ff ff ff bnd jmpq 1f0 <.plt> + +[a-f0-9]+: 68 01 00 00 00 push \$0x1 + +[a-f0-9]+: f2 e9 d1 ff ff ff bnd jmp 1f0 <.plt> +[a-f0-9]+: 90 nop Disassembly of section .plt.sec: 0+220 <bar1@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: f2 ff 25 a5 01 20 00 bnd jmpq \*0x2001a5\(%rip\) # 2003d0 <bar1> + +[a-f0-9]+: f2 ff 25 a5 01 20 00 bnd jmp \*0x2001a5\(%rip\) # 2003d0 <bar1> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) 0+230 <bar2@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: f2 ff 25 9d 01 20 00 bnd jmpq \*0x20019d\(%rip\) # 2003d8 <bar2> + +[a-f0-9]+: f2 ff 25 9d 01 20 00 bnd jmp \*0x20019d\(%rip\) # 2003d8 <bar2> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) Disassembly of section .text: 0+240 <foo>: +[a-f0-9]+: 48 83 ec 08 sub \$0x8,%rsp - +[a-f0-9]+: e8 e7 ff ff ff callq 230 <bar2@plt> + +[a-f0-9]+: e8 e7 ff ff ff call 230 <bar2@plt> +[a-f0-9]+: 48 83 c4 08 add \$0x8,%rsp - +[a-f0-9]+: e9 ce ff ff ff jmpq 220 <bar1@plt> + +[a-f0-9]+: e9 ce ff ff ff jmp 220 <bar1@plt> #pass diff --git a/ld/testsuite/ld-x86-64/ibt-plt-3c-x32.d b/ld/testsuite/ld-x86-64/ibt-plt-3c-x32.d index c1c5ac4..66f4705 100644 --- a/ld/testsuite/ld-x86-64/ibt-plt-3c-x32.d +++ b/ld/testsuite/ld-x86-64/ibt-plt-3c-x32.d @@ -9,35 +9,35 @@ Disassembly of section .plt: [a-f0-9]+ <.plt>: - +[a-f0-9]+: ff 35 ([0-9a-f]{2} ){4}[ ]+pushq 0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 ([0-9a-f]{2} ){4}[ ]+push 0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: e9 e2 ff ff ff jmpq [a-f0-9]+ <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: e9 e2 ff ff ff jmp [a-f0-9]+ <.plt> +[a-f0-9]+: 66 90 xchg %ax,%ax +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 01 00 00 00 pushq \$0x1 - +[a-f0-9]+: e9 d2 ff ff ff jmpq [a-f0-9]+ <.plt> + +[a-f0-9]+: 68 01 00 00 00 push \$0x1 + +[a-f0-9]+: e9 d2 ff ff ff jmp [a-f0-9]+ <.plt> +[a-f0-9]+: 66 90 xchg %ax,%ax Disassembly of section .plt.sec: [a-f0-9]+ <bar1@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar1> + +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar1> +[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%rax,%rax,1\) [a-f0-9]+ <bar2@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar2> + +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar2> +[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%rax,%rax,1\) Disassembly of section .text: [a-f0-9]+ <foo>: +[a-f0-9]+: 48 83 ec 08 sub \$0x8,%rsp - +[a-f0-9]+: e8 e7 ff ff ff callq [a-f0-9]+ <bar2@plt> + +[a-f0-9]+: e8 e7 ff ff ff call [a-f0-9]+ <bar2@plt> +[a-f0-9]+: 48 83 c4 08 add \$0x8,%rsp - +[a-f0-9]+: e9 ce ff ff ff jmpq [a-f0-9]+ <bar1@plt> + +[a-f0-9]+: e9 ce ff ff ff jmp [a-f0-9]+ <bar1@plt> #pass diff --git a/ld/testsuite/ld-x86-64/ibt-plt-3c.d b/ld/testsuite/ld-x86-64/ibt-plt-3c.d index fcb8cb9..5c918b8 100644 --- a/ld/testsuite/ld-x86-64/ibt-plt-3c.d +++ b/ld/testsuite/ld-x86-64/ibt-plt-3c.d @@ -9,35 +9,35 @@ Disassembly of section .plt: [a-f0-9]+ <.plt>: - +[a-f0-9]+: ff 35 ([0-9a-f]{2} ){4}[ ]+pushq 0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: f2 ff 25 ([0-9a-f]{2} ){4}[ ]+bnd jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 ([0-9a-f]{2} ){4}[ ]+push 0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: f2 ff 25 ([0-9a-f]{2} ){4}[ ]+bnd jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: f2 e9 e1 ff ff ff bnd jmpq [a-f0-9]+ <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: f2 e9 e1 ff ff ff bnd jmp [a-f0-9]+ <.plt> +[a-f0-9]+: 90 nop +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: 68 01 00 00 00 pushq \$0x1 - +[a-f0-9]+: f2 e9 d1 ff ff ff bnd jmpq [a-f0-9]+ <.plt> + +[a-f0-9]+: 68 01 00 00 00 push \$0x1 + +[a-f0-9]+: f2 e9 d1 ff ff ff bnd jmp [a-f0-9]+ <.plt> +[a-f0-9]+: 90 nop Disassembly of section .plt.sec: [a-f0-9]+ <bar1@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: f2 ff 25 ([0-9a-f]{2} ){4}[ ]+bnd jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar1> + +[a-f0-9]+: f2 ff 25 ([0-9a-f]{2} ){4}[ ]+bnd jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar1> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) [a-f0-9]+ <bar2@plt>: +[a-f0-9]+: f3 0f 1e fa endbr64 - +[a-f0-9]+: f2 ff 25 ([0-9a-f]{2} ){4}[ ]+bnd jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar2> + +[a-f0-9]+: f2 ff 25 ([0-9a-f]{2} ){4}[ ]+bnd jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar2> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) Disassembly of section .text: [a-f0-9]+ <foo>: +[a-f0-9]+: 48 83 ec 08 sub \$0x8,%rsp - +[a-f0-9]+: e8 e7 ff ff ff callq [a-f0-9]+ <bar2@plt> + +[a-f0-9]+: e8 e7 ff ff ff call [a-f0-9]+ <bar2@plt> +[a-f0-9]+: 48 83 c4 08 add \$0x8,%rsp - +[a-f0-9]+: e9 ce ff ff ff jmpq [a-f0-9]+ <bar1@plt> + +[a-f0-9]+: e9 ce ff ff ff jmp [a-f0-9]+ <bar1@plt> #pass diff --git a/ld/testsuite/ld-x86-64/libno-plt-1b.dd b/ld/testsuite/ld-x86-64/libno-plt-1b.dd index 93d8a7b..83c94b1 100644 --- a/ld/testsuite/ld-x86-64/libno-plt-1b.dd +++ b/ld/testsuite/ld-x86-64/libno-plt-1b.dd @@ -8,8 +8,8 @@ Disassembly of section .text: #... [0-9a-f]+ <get_func>: +[a-f0-9]+: 48 8b 05 ([0-9a-f]{2} ){4}[ ]+mov 0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*> - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * #... [0-9a-f]+ <call_func>: - +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmpq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmp \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> #pass diff --git a/ld/testsuite/ld-x86-64/mpx3.dd b/ld/testsuite/ld-x86-64/mpx3.dd index 8ba3d87..96e56fc 100644 --- a/ld/testsuite/ld-x86-64/mpx3.dd +++ b/ld/testsuite/ld-x86-64/mpx3.dd @@ -4,25 +4,25 @@ Disassembly of section .plt: 0+[a-f0-9]+ <.plt>: -[ ]*[a-f0-9]+: ff ([0-9a-f]{2} ){5} pushq 0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x8> -[ ]*[a-f0-9]+: f2 ff ([0-9a-f]{2} ){5} bnd jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x10> +[ ]*[a-f0-9]+: ff ([0-9a-f]{2} ){5} push 0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x8> +[ ]*[a-f0-9]+: f2 ff ([0-9a-f]{2} ){5} bnd jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x10> [ ]*[a-f0-9]+: 0f 1f 00 nopl \(%rax\) -[ ]*[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 -[ ]*[a-f0-9]+: f2 e9 ([0-9a-f]{2} ){4} bnd jmpq [a-f0-9]+ <.plt> +[ ]*[a-f0-9]+: 68 00 00 00 00 push \$0x0 +[ ]*[a-f0-9]+: f2 e9 ([0-9a-f]{2} ){4} bnd jmp [a-f0-9]+ <.plt> [ ]*[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) Disassembly of section .plt.sec: 0+[a-f0-9]+ <call1@plt>: -[ ]*[a-f0-9]+: f2 ff ([0-9a-f]{2} ){5} bnd jmpq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <call1> +[ ]*[a-f0-9]+: f2 ff ([0-9a-f]{2} ){5} bnd jmp \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <call1> [ ]*[a-f0-9]+: 90 nop Disassembly of section .text: 0+[a-f0-9]+ <_start>: [ ]*[a-f0-9]+: bf ([0-9a-f]{2} ){4} mov \$0x[a-f0-9]+,%edi -[ ]*[a-f0-9]+: f2 ff d7 bnd callq \*%rdi +[ ]*[a-f0-9]+: f2 ff d7 bnd call \*%rdi [ ]*[a-f0-9]+: 48 8b ([0-9a-f]{2} ){5} mov 0x[a-f0-9]+\(%rip\),%rdi # [a-f0-9]+ <call2> -[ ]*[a-f0-9]+: f2 ff d7 bnd callq \*%rdi -[ ]*[a-f0-9]+: c3 retq +[ ]*[a-f0-9]+: f2 ff d7 bnd call \*%rdi +[ ]*[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/mpx3n.dd b/ld/testsuite/ld-x86-64/mpx3n.dd index 505237e..f4609d5 100644 --- a/ld/testsuite/ld-x86-64/mpx3n.dd +++ b/ld/testsuite/ld-x86-64/mpx3n.dd @@ -4,25 +4,25 @@ Disassembly of section .plt: 0+400220 <.plt>: - +[a-f0-9]+: ff 35 a2 01 20 00 pushq 0x2001a2\(%rip\) # 6003c8 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: f2 ff 25 a3 01 20 00 bnd jmpq \*0x2001a3\(%rip\) # 6003d0 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 a2 01 20 00 push 0x2001a2\(%rip\) # 6003c8 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: f2 ff 25 a3 01 20 00 bnd jmp \*0x2001a3\(%rip\) # 6003d0 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmpq 400220 <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmp 400220 <.plt> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) Disassembly of section .plt.sec: 0+400240 <call1@plt>: - +[a-f0-9]+: f2 ff 25 91 01 20 00 bnd jmpq \*0x200191\(%rip\) # 6003d8 <call1> + +[a-f0-9]+: f2 ff 25 91 01 20 00 bnd jmp \*0x200191\(%rip\) # 6003d8 <call1> +[a-f0-9]+: 90 nop Disassembly of section .text: 0+400248 <_start>: +[a-f0-9]+: bf 40 02 40 00 mov \$0x400240,%edi - +[a-f0-9]+: f2 ff d7 bnd callq \*%rdi + +[a-f0-9]+: f2 ff d7 bnd call \*%rdi +[a-f0-9]+: 48 8b 3d 89 01 20 00 mov 0x200189\(%rip\),%rdi # 6003e0 <call2> - +[a-f0-9]+: f2 ff d7 bnd callq \*%rdi - +[a-f0-9]+: c3 retq + +[a-f0-9]+: f2 ff d7 bnd call \*%rdi + +[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/mpx4.dd b/ld/testsuite/ld-x86-64/mpx4.dd index 0da0840..35f6869 100644 --- a/ld/testsuite/ld-x86-64/mpx4.dd +++ b/ld/testsuite/ld-x86-64/mpx4.dd @@ -4,21 +4,21 @@ Disassembly of section .plt: 0+4001f0 <.plt>: - +[a-f0-9]+: ff 35 42 01 20 00 pushq 0x200142\(%rip\) # 600338 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: f2 ff 25 43 01 20 00 bnd jmpq \*0x200143\(%rip\) # 600340 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 42 01 20 00 push 0x200142\(%rip\) # 600338 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: f2 ff 25 43 01 20 00 bnd jmp \*0x200143\(%rip\) # 600340 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmpq 4001f0 <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmp 4001f0 <.plt> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) Disassembly of section .plt.sec: 0+400210 <call1@plt>: - +[a-f0-9]+: f2 ff 25 31 01 20 00 bnd jmpq \*0x200131\(%rip\) # 600348 <call1> + +[a-f0-9]+: f2 ff 25 31 01 20 00 bnd jmp \*0x200131\(%rip\) # 600348 <call1> +[a-f0-9]+: 90 nop Disassembly of section .text: 0+400218 <_start>: +[a-f0-9]+: bf 10 02 40 00 mov \$0x400210,%edi - +[a-f0-9]+: f2 ff d7 bnd callq \*%rdi + +[a-f0-9]+: f2 ff d7 bnd call \*%rdi diff --git a/ld/testsuite/ld-x86-64/mpx4n.dd b/ld/testsuite/ld-x86-64/mpx4n.dd index 73ebb8d..5585610 100644 --- a/ld/testsuite/ld-x86-64/mpx4n.dd +++ b/ld/testsuite/ld-x86-64/mpx4n.dd @@ -4,22 +4,22 @@ Disassembly of section .plt: 0+4001f0 <.plt>: - +[a-f0-9]+: ff 35 62 01 20 00 pushq 0x200162\(%rip\) # 600358 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: f2 ff 25 63 01 20 00 bnd jmpq \*0x200163\(%rip\) # 600360 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 62 01 20 00 push 0x200162\(%rip\) # 600358 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: f2 ff 25 63 01 20 00 bnd jmp \*0x200163\(%rip\) # 600360 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmpq 4001f0 <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmp 4001f0 <.plt> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) Disassembly of section .plt.sec: 0+400210 <call1@plt>: - +[a-f0-9]+: f2 ff 25 51 01 20 00 bnd jmpq \*0x200151\(%rip\) # 600368 <call1> + +[a-f0-9]+: f2 ff 25 51 01 20 00 bnd jmp \*0x200151\(%rip\) # 600368 <call1> +[a-f0-9]+: 90 nop Disassembly of section .text: 0+400218 <_start>: +[a-f0-9]+: bf 10 02 40 00 mov \$0x400210,%edi - +[a-f0-9]+: f2 ff d7 bnd callq \*%rdi + +[a-f0-9]+: f2 ff d7 bnd call \*%rdi #pass diff --git a/ld/testsuite/ld-x86-64/no-plt-1a.dd b/ld/testsuite/ld-x86-64/no-plt-1a.dd index a8445c7..b1d5d7e 100644 --- a/ld/testsuite/ld-x86-64/no-plt-1a.dd +++ b/ld/testsuite/ld-x86-64/no-plt-1a.dd @@ -8,27 +8,27 @@ Disassembly of section .text: #... [0-9a-f]+ <check>: +[a-f0-9]+: 48 83 ec 08 sub \$0x8,%rsp - +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 callq [0-9a-f]+ <get_func> + +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 call [0-9a-f]+ <get_func> +[a-f0-9]+: 48 81 f8 ([0-9a-f]{2} ){4}[ ]+cmp \$0x[0-9a-f]+,%rax +[a-f0-9]+: 75 34 jne [0-9a-f]+ <check\+0x[0-9a-f]+> +[a-f0-9]+: 4(0|8) 39 05 ([0-9a-f]{2} ){4}[ ]+(rex |)cmp +%(e|r)ax,0x[0-9a-f]+\(%rip\) +# [a-f0-9]+ <func_p> +[a-f0-9]+: 75 2b jne [0-9a-f]+ <check\+0x[0-9a-f]+> - +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 callq [0-9a-f]+ <func> + +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 call [0-9a-f]+ <func> +[a-f0-9]+: 3d 78 56 34 12 cmp \$0x12345678,%eax +[a-f0-9]+: 75 1e jne [0-9a-f]+ <check\+0x[0-9a-f]+> - +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 callq [0-9a-f]+ <call_func> + +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 call [0-9a-f]+ <call_func> +[a-f0-9]+: 3d 78 56 34 12 cmp \$0x12345678,%eax +[a-f0-9]+: 75 11 jne [0-9a-f]+ <check\+0x[0-9a-f]+> +[a-f0-9]+: 48 8d 3d ([0-9a-f]{2} ){4}[ ]+lea 0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.* +[a-f0-9]+: 48 83 c4 08 add \$0x8,%rsp - +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmpq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> - +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmp \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> #... [0-9a-f]+ <get_func>: +[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 + +[a-f0-9]+: c3 ret * #... [0-9a-f]+ <call_func>: - +[a-f0-9]+: e9 ([0-9a-f]{2} ){4}[ ]+jmpq [a-f0-9]+ <func> + +[a-f0-9]+: e9 ([0-9a-f]{2} ){4}[ ]+jmp [a-f0-9]+ <func> +[a-f0-9]+: 90 nop #pass diff --git a/ld/testsuite/ld-x86-64/no-plt-1b.dd b/ld/testsuite/ld-x86-64/no-plt-1b.dd index c21e912..2ab8da5 100644 --- a/ld/testsuite/ld-x86-64/no-plt-1b.dd +++ b/ld/testsuite/ld-x86-64/no-plt-1b.dd @@ -8,19 +8,19 @@ Disassembly of section .text: #... [0-9a-f]+ <check>: +[a-f0-9]+: 48 83 ec 08 sub \$0x8,%rsp - +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> +[a-f0-9]+: 48 3b 05 ([0-9a-f]{2} ){4}[ ]+cmp 0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*> +[a-f0-9]+: 75 34 jne [0-9a-f]+ <check\+0x[0-9a-f]+> +[a-f0-9]+: 4(0|8) 39 05 ([0-9a-f]{2} ){4}[ ]+(rex |)cmp +%(e|r)ax,0x[0-9a-f]+\(%rip\) +# [a-f0-9]+ <.*> +[a-f0-9]+: 75 2b jne [0-9a-f]+ <check\+0x[0-9a-f]+> - +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> +[a-f0-9]+: 3d 78 56 34 12 cmp \$0x12345678,%eax +[a-f0-9]+: 75 1e jne [0-9a-f]+ <check\+0x[0-9a-f]+> - +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> +[a-f0-9]+: 3d 78 56 34 12 cmp \$0x12345678,%eax +[a-f0-9]+: 75 11 jne [0-9a-f]+ <check\+0x[0-9a-f]+> +[a-f0-9]+: 48 8d 3d ([0-9a-f]{2} ){4}[ ]+lea 0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.* +[a-f0-9]+: 48 83 c4 08 add \$0x8,%rsp - +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmpq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> - +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmp \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> #pass diff --git a/ld/testsuite/ld-x86-64/no-plt-1c.dd b/ld/testsuite/ld-x86-64/no-plt-1c.dd index b41246b..1f6ea27 100644 --- a/ld/testsuite/ld-x86-64/no-plt-1c.dd +++ b/ld/testsuite/ld-x86-64/no-plt-1c.dd @@ -8,19 +8,19 @@ Disassembly of section .text: #... [0-9a-f]+ <check>: +[a-f0-9]+: 48 83 ec 08 sub \$0x8,%rsp - +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> +[a-f0-9]+: 48 81 f8 ([0-9a-f]{2} ){4}[ ]+cmp \$0x[0-9a-f]+,%rax +[a-f0-9]+: 75 34 jne [0-9a-f]+ <check\+0x[0-9a-f]+> +[a-f0-9]+: 4(0|8) 39 05 ([0-9a-f]{2} ){4}[ ]+(rex |)cmp +%(e|r)ax,0x[0-9a-f]+\(%rip\) +# [a-f0-9]+ <.*> +[a-f0-9]+: 75 2b jne [0-9a-f]+ <check\+0x[0-9a-f]+> - +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 callq [0-9a-f]+ <func> + +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 call [0-9a-f]+ <func> +[a-f0-9]+: 3d 78 56 34 12 cmp \$0x12345678,%eax +[a-f0-9]+: 75 1e jne [0-9a-f]+ <check\+0x[0-9a-f]+> - +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> +[a-f0-9]+: 3d 78 56 34 12 cmp \$0x12345678,%eax +[a-f0-9]+: 75 11 jne [0-9a-f]+ <check\+0x[0-9a-f]+> +[a-f0-9]+: 48 8d 3d ([0-9a-f]{2} ){4}[ ]+lea 0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.* +[a-f0-9]+: 48 83 c4 08 add \$0x8,%rsp - +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmpq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> - +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmp \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> #pass diff --git a/ld/testsuite/ld-x86-64/no-plt-1d.dd b/ld/testsuite/ld-x86-64/no-plt-1d.dd index eafed71..49f34ad 100644 --- a/ld/testsuite/ld-x86-64/no-plt-1d.dd +++ b/ld/testsuite/ld-x86-64/no-plt-1d.dd @@ -8,28 +8,28 @@ Disassembly of section .text: #... [0-9a-f]+ <check>: +[a-f0-9]+: 48 83 ec 08 sub \$0x8,%rsp - +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 callq [0-9a-f]+ <get_func> + +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 call [0-9a-f]+ <get_func> +[a-f0-9]+: 48 81 f8 ([0-9a-f]{2} ){4}[ ]+cmp \$0x[0-9a-f]+,%rax +[a-f0-9]+: 75 34 jne [0-9a-f]+ <check\+0x[0-9a-f]+> +[a-f0-9]+: 4(0|8) 39 05 ([0-9a-f]{2} ){4}[ ]+(rex |)cmp +%(e|r)ax,0x[0-9a-f]+\(%rip\) +# [a-f0-9]+ <func_p> +[a-f0-9]+: 75 2b jne [0-9a-f]+ <check\+0x[0-9a-f]+> - +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 callq [0-9a-f]+ <func> + +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 call [0-9a-f]+ <func> +[a-f0-9]+: 3d 78 56 34 12 cmp \$0x12345678,%eax +[a-f0-9]+: 75 1e jne [0-9a-f]+ <check\+0x[0-9a-f]+> - +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 callq [0-9a-f]+ <call_func> + +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 call [0-9a-f]+ <call_func> +[a-f0-9]+: 3d 78 56 34 12 cmp \$0x12345678,%eax +[a-f0-9]+: 75 11 jne [0-9a-f]+ <check\+0x[0-9a-f]+> +[a-f0-9]+: 48 8d 3d ([0-9a-f]{2} ){4}[ ]+lea 0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.* +[a-f0-9]+: 48 83 c4 08 add \$0x8,%rsp - +[a-f0-9]+: e9 ([0-9a-f]{2} ){4}[ ]+jmpq [a-f0-9]+ <.*puts.*> + +[a-f0-9]+: e9 ([0-9a-f]{2} ){4}[ ]+jmp [a-f0-9]+ <.*puts.*> +[a-f0-9]+: 90 nop - +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 callq [0-9a-f]+ <abort> + +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 call [0-9a-f]+ <abort> #... [0-9a-f]+ <get_func>: +[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 + +[a-f0-9]+: c3 ret * #... [0-9a-f]+ <call_func>: - +[a-f0-9]+: e9 ([0-9a-f]{2} ){4}[ ]+jmpq [a-f0-9]+ <func> + +[a-f0-9]+: e9 ([0-9a-f]{2} ){4}[ ]+jmp [a-f0-9]+ <func> +[a-f0-9]+: 90 nop #pass diff --git a/ld/testsuite/ld-x86-64/no-plt-1e.dd b/ld/testsuite/ld-x86-64/no-plt-1e.dd index f3b07ab..465574f 100644 --- a/ld/testsuite/ld-x86-64/no-plt-1e.dd +++ b/ld/testsuite/ld-x86-64/no-plt-1e.dd @@ -8,27 +8,27 @@ Disassembly of section .text: #... [0-9a-f]+ <check>: +[a-f0-9]+: 48 83 ec 08 sub \$0x8,%rsp - +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 callq [0-9a-f]+ <get_func> + +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 call [0-9a-f]+ <get_func> +[a-f0-9]+: 48 3b 05 ([0-9a-f]{2} ){4}[ ]+cmp 0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*> +[a-f0-9]+: 75 34 jne [0-9a-f]+ <check\+0x[0-9a-f]+> +[a-f0-9]+: 4(0|8) 39 05 ([0-9a-f]{2} ){4}[ ]+(rex |)cmp +%(e|r)ax,0x[0-9a-f]+\(%rip\) +# [a-f0-9]+ <func_p> +[a-f0-9]+: 75 2b jne [0-9a-f]+ <check\+0x[0-9a-f]+> - +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 callq [0-9a-f]+ <func> + +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 call [0-9a-f]+ <func> +[a-f0-9]+: 3d 78 56 34 12 cmp \$0x12345678,%eax +[a-f0-9]+: 75 1e jne [0-9a-f]+ <check\+0x[0-9a-f]+> - +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 callq [0-9a-f]+ <call_func> + +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 call [0-9a-f]+ <call_func> +[a-f0-9]+: 3d 78 56 34 12 cmp \$0x12345678,%eax +[a-f0-9]+: 75 11 jne [0-9a-f]+ <check\+0x[0-9a-f]+> +[a-f0-9]+: 48 8d 3d ([0-9a-f]{2} ){4}[ ]+lea 0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.* +[a-f0-9]+: 48 83 c4 08 add \$0x8,%rsp - +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmpq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> - +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmp \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> #... [0-9a-f]+ <get_func>: +[a-f0-9]+: 48 8d 05 ([0-9a-f]{2} ){4}[ ]+lea -0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <func> - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * #... [0-9a-f]+ <call_func>: - +[a-f0-9]+: e9 ([0-9a-f]{2} ){4}[ ]+jmpq [a-f0-9]+ <func> + +[a-f0-9]+: e9 ([0-9a-f]{2} ){4}[ ]+jmp [a-f0-9]+ <func> +[a-f0-9]+: 90 nop #pass diff --git a/ld/testsuite/ld-x86-64/no-plt-1f.dd b/ld/testsuite/ld-x86-64/no-plt-1f.dd index c21e912..2ab8da5 100644 --- a/ld/testsuite/ld-x86-64/no-plt-1f.dd +++ b/ld/testsuite/ld-x86-64/no-plt-1f.dd @@ -8,19 +8,19 @@ Disassembly of section .text: #... [0-9a-f]+ <check>: +[a-f0-9]+: 48 83 ec 08 sub \$0x8,%rsp - +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> +[a-f0-9]+: 48 3b 05 ([0-9a-f]{2} ){4}[ ]+cmp 0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*> +[a-f0-9]+: 75 34 jne [0-9a-f]+ <check\+0x[0-9a-f]+> +[a-f0-9]+: 4(0|8) 39 05 ([0-9a-f]{2} ){4}[ ]+(rex |)cmp +%(e|r)ax,0x[0-9a-f]+\(%rip\) +# [a-f0-9]+ <.*> +[a-f0-9]+: 75 2b jne [0-9a-f]+ <check\+0x[0-9a-f]+> - +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> +[a-f0-9]+: 3d 78 56 34 12 cmp \$0x12345678,%eax +[a-f0-9]+: 75 1e jne [0-9a-f]+ <check\+0x[0-9a-f]+> - +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> +[a-f0-9]+: 3d 78 56 34 12 cmp \$0x12345678,%eax +[a-f0-9]+: 75 11 jne [0-9a-f]+ <check\+0x[0-9a-f]+> +[a-f0-9]+: 48 8d 3d ([0-9a-f]{2} ){4}[ ]+lea 0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.* +[a-f0-9]+: 48 83 c4 08 add \$0x8,%rsp - +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmpq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> - +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmp \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> #pass diff --git a/ld/testsuite/ld-x86-64/no-plt-1g.dd b/ld/testsuite/ld-x86-64/no-plt-1g.dd index ca4eb59..0526fb0 100644 --- a/ld/testsuite/ld-x86-64/no-plt-1g.dd +++ b/ld/testsuite/ld-x86-64/no-plt-1g.dd @@ -8,19 +8,19 @@ Disassembly of section .text: #... [0-9a-f]+ <check>: +[a-f0-9]+: 48 83 ec 08 sub \$0x8,%rsp - +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> +[a-f0-9]+: 48 3b 05 ([0-9a-f]{2} ){4}[ ]+cmp 0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*> +[a-f0-9]+: 75 34 jne [0-9a-f]+ <check\+0x[0-9a-f]+> +[a-f0-9]+: 4(0|8) 39 05 ([0-9a-f]{2} ){4}[ ]+(rex |)cmp +%(e|r)ax,0x[0-9a-f]+\(%rip\) +# [a-f0-9]+ <.*> +[a-f0-9]+: 75 2b jne [0-9a-f]+ <check\+0x[0-9a-f]+> - +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 callq [0-9a-f]+ <func> + +[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 call [0-9a-f]+ <func> +[a-f0-9]+: 3d 78 56 34 12 cmp \$0x12345678,%eax +[a-f0-9]+: 75 1e jne [0-9a-f]+ <check\+0x[0-9a-f]+> - +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> +[a-f0-9]+: 3d 78 56 34 12 cmp \$0x12345678,%eax +[a-f0-9]+: 75 11 jne [0-9a-f]+ <check\+0x[0-9a-f]+> +[a-f0-9]+: 48 8d 3d ([0-9a-f]{2} ){4}[ ]+lea 0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.* +[a-f0-9]+: 48 83 c4 08 add \$0x8,%rsp - +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmpq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> - +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 25 ([0-9a-f]{2} ){4}[ ]+jmp \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4}[ ]+call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> #pass diff --git a/ld/testsuite/ld-x86-64/plt-main-bnd.dd b/ld/testsuite/ld-x86-64/plt-main-bnd.dd index c5ef1b3..70b8d54 100644 --- a/ld/testsuite/ld-x86-64/plt-main-bnd.dd +++ b/ld/testsuite/ld-x86-64/plt-main-bnd.dd @@ -2,6 +2,6 @@ Disassembly of section .plt.got: [a-f0-9]+ <[a-z_]+@plt>: -[ ]*[a-f0-9]+: f2 ff 25 .. .. 20 00 bnd jmpq \*0x20....\(%rip\) # ...... <.*> +[ ]*[a-f0-9]+: f2 ff 25 .. .. 20 00 bnd jmp \*0x20....\(%rip\) # ...... <.*> [ ]*[a-f0-9]+: 90 nop #pass diff --git a/ld/testsuite/ld-x86-64/plt-main-ibt-x32.dd b/ld/testsuite/ld-x86-64/plt-main-ibt-x32.dd index ab5e00d..84e1d17 100644 --- a/ld/testsuite/ld-x86-64/plt-main-ibt-x32.dd +++ b/ld/testsuite/ld-x86-64/plt-main-ibt-x32.dd @@ -3,5 +3,5 @@ Disassembly of section .plt.got: [a-f0-9]+ <[_a-z]+@plt>: [ ]*[a-f0-9]+: f3 0f 1e fa endbr64 -[ ]*[a-f0-9]+: ff 25 .. .. 20 00 jmpq +\*0x20....\(%rip\) # ...... <.*> +[ ]*[a-f0-9]+: ff 25 .. .. 20 00 jmp +\*0x20....\(%rip\) # ...... <.*> #pass diff --git a/ld/testsuite/ld-x86-64/plt-main-ibt.dd b/ld/testsuite/ld-x86-64/plt-main-ibt.dd index e2d6750..3c9c658 100644 --- a/ld/testsuite/ld-x86-64/plt-main-ibt.dd +++ b/ld/testsuite/ld-x86-64/plt-main-ibt.dd @@ -3,5 +3,5 @@ Disassembly of section .plt.got: [a-f0-9]+ <[_a-z]+@plt>: [ ]*[a-f0-9]+: f3 0f 1e fa endbr64 -[ ]*[a-f0-9]+: f2 ff 25 .. .. 20 00 bnd jmpq \*0x20....\(%rip\) # ...... <.*> +[ ]*[a-f0-9]+: f2 ff 25 .. .. 20 00 bnd jmp \*0x20....\(%rip\) # ...... <.*> #pass diff --git a/ld/testsuite/ld-x86-64/plt.pd b/ld/testsuite/ld-x86-64/plt.pd index b303d36..54a00df 100644 --- a/ld/testsuite/ld-x86-64/plt.pd +++ b/ld/testsuite/ld-x86-64/plt.pd @@ -9,16 +9,16 @@ Disassembly of section .plt: [0-9a-f]+ <.plt>: - +[0-9a-f]+: ff 35 ([0-9a-f]{2} ){4} * pushq 0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x8> - +[0-9a-f]+: ff 25 ([0-9a-f]{2} ){4} * jmpq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x10> + +[0-9a-f]+: ff 35 ([0-9a-f]{2} ){4} * push 0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x8> + +[0-9a-f]+: ff 25 ([0-9a-f]{2} ){4} * jmp \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x10> +[0-9a-f]+: 0f 1f 40 00 nopl 0x0\(%rax\) [0-9a-f]+ <fn1@plt>: - +[0-9a-f]+: ff 25 ([0-9a-f]{2} ){4} * jmpq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <fn1> - +[0-9a-f]+: 68 00 00 00 00 pushq \$0x0 - +[0-9a-f]+: e9 ([0-9a-f]{2} ){4} * jmpq [0-9a-f]+ <.plt> + +[0-9a-f]+: ff 25 ([0-9a-f]{2} ){4} * jmp \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <fn1> + +[0-9a-f]+: 68 00 00 00 00 push \$0x0 + +[0-9a-f]+: e9 ([0-9a-f]{2} ){4} * jmp [0-9a-f]+ <.plt> [0-9a-f]+ <fn2@plt>: - +[0-9a-f]+: ff 25 ([0-9a-f]{2} ){4} * jmpq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <fn2> - +[0-9a-f]+: 68 01 00 00 00 pushq \$0x1 - +[0-9a-f]+: e9 ([0-9a-f]{2} ){4} * jmpq [0-9a-f]+ <.plt> + +[0-9a-f]+: ff 25 ([0-9a-f]{2} ){4} * jmp \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <fn2> + +[0-9a-f]+: 68 01 00 00 00 push \$0x1 + +[0-9a-f]+: e9 ([0-9a-f]{2} ){4} * jmp [0-9a-f]+ <.plt> diff --git a/ld/testsuite/ld-x86-64/plt2.dd b/ld/testsuite/ld-x86-64/plt2.dd index 7c05c6f..663ec98 100644 --- a/ld/testsuite/ld-x86-64/plt2.dd +++ b/ld/testsuite/ld-x86-64/plt2.dd @@ -10,24 +10,24 @@ Disassembly of section .plt: 0+400220 <.plt>: - +[a-f0-9]+: ff 35 7a 01 20 00 pushq 0x20017a\(%rip\) # 6003a0 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: ff 25 7c 01 20 00 jmpq \*0x20017c\(%rip\) # 6003a8 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 7a 01 20 00 push 0x20017a\(%rip\) # 6003a0 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: ff 25 7c 01 20 00 jmp \*0x20017c\(%rip\) # 6003a8 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) 0+400230 <fn1@plt>: - +[a-f0-9]+: ff 25 7a 01 20 00 jmpq \*0x20017a\(%rip\) # 6003b0 <fn1> - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: e9 e0 ff ff ff jmpq 400220 <.plt> + +[a-f0-9]+: ff 25 7a 01 20 00 jmp \*0x20017a\(%rip\) # 6003b0 <fn1> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: e9 e0 ff ff ff jmp 400220 <.plt> 0+400240 <fn2@plt>: - +[a-f0-9]+: ff 25 72 01 20 00 jmpq \*0x200172\(%rip\) # 6003b8 <fn2> - +[a-f0-9]+: 68 01 00 00 00 pushq \$0x1 - +[a-f0-9]+: e9 d0 ff ff ff jmpq 400220 <.plt> + +[a-f0-9]+: ff 25 72 01 20 00 jmp \*0x200172\(%rip\) # 6003b8 <fn2> + +[a-f0-9]+: 68 01 00 00 00 push \$0x1 + +[a-f0-9]+: e9 d0 ff ff ff jmp 400220 <.plt> Disassembly of section .text: 0+400250 <_start>: - +[a-f0-9]+: e8 db ff ff ff callq 400230 <fn1@plt> - +[a-f0-9]+: e8 e6 ff ff ff callq 400240 <fn2@plt> + +[a-f0-9]+: e8 db ff ff ff call 400230 <fn1@plt> + +[a-f0-9]+: e8 e6 ff ff ff call 400240 <fn2@plt> +[a-f0-9]+: 81 7c 24 08 30 02 40 00 cmpl \$0x400230,0x8\(%rsp\) #pass diff --git a/ld/testsuite/ld-x86-64/pr19609-5a.d b/ld/testsuite/ld-x86-64/pr19609-5a.d index 39948e0..8a5855d 100644 --- a/ld/testsuite/ld-x86-64/pr19609-5a.d +++ b/ld/testsuite/ld-x86-64/pr19609-5a.d @@ -9,4 +9,4 @@ Disassembly of section .text: [a-f0-9]+ <_start>: -[ ]+[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 callq 0 <_start-0x[0-9a-f]+> +[ ]+[a-f0-9]+: 67 e8 ([0-9a-f]{2} ){4}[ ]+addr32 call 0 <_start-0x[0-9a-f]+> diff --git a/ld/testsuite/ld-x86-64/pr19609-5b.d b/ld/testsuite/ld-x86-64/pr19609-5b.d index 257fa63..7117d13 100644 --- a/ld/testsuite/ld-x86-64/pr19609-5b.d +++ b/ld/testsuite/ld-x86-64/pr19609-5b.d @@ -9,4 +9,4 @@ Disassembly of section .text: [a-f0-9]+ <_start>: -[ ]+[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4} * callq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <.*> +[ ]+[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4} * call \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <.*> diff --git a/ld/testsuite/ld-x86-64/pr19609-5c.d b/ld/testsuite/ld-x86-64/pr19609-5c.d index 1de68b4..63dd31a 100644 --- a/ld/testsuite/ld-x86-64/pr19609-5c.d +++ b/ld/testsuite/ld-x86-64/pr19609-5c.d @@ -9,4 +9,4 @@ Disassembly of section .text: [a-f0-9]+ <_start>: -[ ]+[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4} * callq \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar> +[ ]+[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4} * call \*0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <bar> diff --git a/ld/testsuite/ld-x86-64/pr19609-5e.d b/ld/testsuite/ld-x86-64/pr19609-5e.d index 90bdb3d..baace28 100644 --- a/ld/testsuite/ld-x86-64/pr19609-5e.d +++ b/ld/testsuite/ld-x86-64/pr19609-5e.d @@ -9,4 +9,4 @@ Disassembly of section .text: [a-f0-9]+ <_start>: -[ ]+[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4} * callq \*-?0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <.*> +[ ]+[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4} * call \*-?0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <.*> diff --git a/ld/testsuite/ld-x86-64/pr19609-7b.d b/ld/testsuite/ld-x86-64/pr19609-7b.d index 898a5df..20b42e8 100644 --- a/ld/testsuite/ld-x86-64/pr19609-7b.d +++ b/ld/testsuite/ld-x86-64/pr19609-7b.d @@ -9,5 +9,5 @@ Disassembly of section .text: [a-f0-9]+ <_start>: -[ ]*[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4} * callq \*-?0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <.got> +[ ]*[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4} * call \*-?0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <.got> #pass diff --git a/ld/testsuite/ld-x86-64/pr19609-7d.d b/ld/testsuite/ld-x86-64/pr19609-7d.d index 476cafa..034a57b 100644 --- a/ld/testsuite/ld-x86-64/pr19609-7d.d +++ b/ld/testsuite/ld-x86-64/pr19609-7d.d @@ -9,5 +9,5 @@ Disassembly of section .text: [a-f0-9]+ <_start>: -[ ]*[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4} * callq \*-?0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <.got> +[ ]*[a-f0-9]+: ff 15 ([0-9a-f]{2} ){4} * call \*-?0x[a-f0-9]+\(%rip\) # [a-f0-9]+ <.got> #pass diff --git a/ld/testsuite/ld-x86-64/pr19636-2d.d b/ld/testsuite/ld-x86-64/pr19636-2d.d index 1815d2c..3bd33a9 100644 --- a/ld/testsuite/ld-x86-64/pr19636-2d.d +++ b/ld/testsuite/ld-x86-64/pr19636-2d.d @@ -9,16 +9,16 @@ Disassembly of section .plt: 0+120 <.plt>: -[ ]*[a-f0-9]+: ff 35 2a 01 20 00 pushq 0x20012a\(%rip\) # 200250 <_GLOBAL_OFFSET_TABLE_\+0x8> -[ ]*[a-f0-9]+: ff 25 2c 01 20 00 jmpq \*0x20012c\(%rip\) # 200258 <_GLOBAL_OFFSET_TABLE_\+0x10> +[ ]*[a-f0-9]+: ff 35 2a 01 20 00 push 0x20012a\(%rip\) # 200250 <_GLOBAL_OFFSET_TABLE_\+0x8> +[ ]*[a-f0-9]+: ff 25 2c 01 20 00 jmp \*0x20012c\(%rip\) # 200258 <_GLOBAL_OFFSET_TABLE_\+0x10> [ ]*[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) -[ ]*[a-f0-9]+: ff 25 2a 01 20 00 jmpq \*0x20012a\(%rip\) # 200260 <_GLOBAL_OFFSET_TABLE_\+0x18> -[ ]*[a-f0-9]+: 68 00 00 00 00 pushq \$0x0+ -[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq [a-f0-9]+ <.*> +[ ]*[a-f0-9]+: ff 25 2a 01 20 00 jmp \*0x20012a\(%rip\) # 200260 <_GLOBAL_OFFSET_TABLE_\+0x18> +[ ]*[a-f0-9]+: 68 00 00 00 00 push \$0x0+ +[ ]*[a-f0-9]+: e9 00 00 00 00 jmp [a-f0-9]+ <.*> Disassembly of section .text: 0+140 <_start>: [ ]*[a-f0-9]+: 48 3b 05 f1 00 20 00 cmp 0x2000f1\(%rip\),%rax # 200238 <.*> -[ ]*[a-f0-9]+: ff 25 f3 00 20 00 jmpq \*0x2000f3\(%rip\) # 200240 <.*> -[ ]*[a-f0-9]+: e8 de ff ff ff callq 130 <.*> +[ ]*[a-f0-9]+: ff 25 f3 00 20 00 jmp \*0x2000f3\(%rip\) # 200240 <.*> +[ ]*[a-f0-9]+: e8 de ff ff ff call 130 <.*> diff --git a/ld/testsuite/ld-x86-64/pr19636-2l.d b/ld/testsuite/ld-x86-64/pr19636-2l.d index 994a6da..c9b256d 100644 --- a/ld/testsuite/ld-x86-64/pr19636-2l.d +++ b/ld/testsuite/ld-x86-64/pr19636-2l.d @@ -10,17 +10,17 @@ Disassembly of section .plt: 0+120 <.plt>: - +[a-f0-9]+: ff 35 2a 01 20 00 pushq 0x20012a\(%rip\) # 200250 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: ff 25 2c 01 20 00 jmpq \*0x20012c\(%rip\) # 200258 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 2a 01 20 00 push 0x20012a\(%rip\) # 200250 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: ff 25 2c 01 20 00 jmp \*0x20012c\(%rip\) # 200258 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) - +[a-f0-9]+: ff 25 2a 01 20 00 jmpq \*0x20012a\(%rip\) # 200260 <_GLOBAL_OFFSET_TABLE_\+0x18> - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: e9 00 00 00 00 jmpq 140 <_start> + +[a-f0-9]+: ff 25 2a 01 20 00 jmp \*0x20012a\(%rip\) # 200260 <_GLOBAL_OFFSET_TABLE_\+0x18> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: e9 00 00 00 00 jmp 140 <_start> Disassembly of section .text: 0+140 <_start>: +[a-f0-9]+: 48 3b 05 f1 00 20 00 cmp 0x2000f1\(%rip\),%rax # 200238 <.got> - +[a-f0-9]+: ff 25 f3 00 20 00 jmpq \*0x2000f3\(%rip\) # 200240 <.got\+0x8> - +[a-f0-9]+: e8 de ff ff ff callq 130 <.plt\+0x10> + +[a-f0-9]+: ff 25 f3 00 20 00 jmp \*0x2000f3\(%rip\) # 200240 <.got\+0x8> + +[a-f0-9]+: e8 de ff ff ff call 130 <.plt\+0x10> #pass diff --git a/ld/testsuite/ld-x86-64/pr20253-1b.d b/ld/testsuite/ld-x86-64/pr20253-1b.d index fdf94e1..f6f5eba 100644 --- a/ld/testsuite/ld-x86-64/pr20253-1b.d +++ b/ld/testsuite/ld-x86-64/pr20253-1b.d @@ -9,14 +9,14 @@ Disassembly of section .text: 0+4000e0 <foo>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * 0+4000e1 <bar>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * 0+4000e2 <_start>: - +[a-f0-9]+: ff 15 28 00 20 00 callq \*0x200028\(%rip\) # 600110 <.*> - +[a-f0-9]+: ff 25 2a 00 20 00 jmpq \*0x20002a\(%rip\) # 600118 <.*> + +[a-f0-9]+: ff 15 28 00 20 00 call \*0x200028\(%rip\) # 600110 <.*> + +[a-f0-9]+: ff 25 2a 00 20 00 jmp \*0x20002a\(%rip\) # 600118 <.*> +[a-f0-9]+: 48 c7 05 1f 00 20 00 00 00 00 00 movq \$0x0,0x20001f\(%rip\) # 600118 <.*> +[a-f0-9]+: 48 83 3d 0f 00 20 00 00 cmpq \$0x0,0x20000f\(%rip\) # 600110 <.*> +[a-f0-9]+: 48 3b 0d 08 00 20 00 cmp 0x200008\(%rip\),%rcx # 600110 <.*> diff --git a/ld/testsuite/ld-x86-64/pr20253-1d.d b/ld/testsuite/ld-x86-64/pr20253-1d.d index aed1605..28fbc99 100644 --- a/ld/testsuite/ld-x86-64/pr20253-1d.d +++ b/ld/testsuite/ld-x86-64/pr20253-1d.d @@ -9,14 +9,14 @@ Disassembly of section .text: 0+1c8 <foo>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * 0+1c9 <bar>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * 0+1ca <_start>: - +[a-f0-9]+: ff 15 28 01 20 00 callq \*0x200128\(%rip\) # 2002f8 <.got> - +[a-f0-9]+: ff 25 2a 01 20 00 jmpq \*0x20012a\(%rip\) # 200300 <.got\+0x8> + +[a-f0-9]+: ff 15 28 01 20 00 call \*0x200128\(%rip\) # 2002f8 <.got> + +[a-f0-9]+: ff 25 2a 01 20 00 jmp \*0x20012a\(%rip\) # 200300 <.got\+0x8> +[a-f0-9]+: 48 c7 05 1f 01 20 00 00 00 00 00 movq \$0x0,0x20011f\(%rip\) # 200300 <.got\+0x8> +[a-f0-9]+: 48 83 3d 0f 01 20 00 00 cmpq \$0x0,0x20010f\(%rip\) # 2002f8 <.got> +[a-f0-9]+: 48 3b 0d 08 01 20 00 cmp 0x200108\(%rip\),%rcx # 2002f8 <.got> diff --git a/ld/testsuite/ld-x86-64/pr20253-1f.d b/ld/testsuite/ld-x86-64/pr20253-1f.d index 884d127..6666bca 100644 --- a/ld/testsuite/ld-x86-64/pr20253-1f.d +++ b/ld/testsuite/ld-x86-64/pr20253-1f.d @@ -9,14 +9,14 @@ Disassembly of section .text: 0+188 <foo>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * 0+189 <bar>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * 0+18a <_start>: - +[a-f0-9]+: ff 15 08 01 20 00 callq \*0x200108\(%rip\) # 200298 <.*> - +[a-f0-9]+: ff 25 0a 01 20 00 jmpq \*0x20010a\(%rip\) # 2002a0 <.*> + +[a-f0-9]+: ff 15 08 01 20 00 call \*0x200108\(%rip\) # 200298 <.*> + +[a-f0-9]+: ff 25 0a 01 20 00 jmp \*0x20010a\(%rip\) # 2002a0 <.*> +[a-f0-9]+: 48 c7 05 ff 00 20 00 00 00 00 00 movq \$0x0,0x2000ff\(%rip\) # 2002a0 <.*> +[a-f0-9]+: 48 83 3d ef 00 20 00 00 cmpq \$0x0,0x2000ef\(%rip\) # 200298 <.*> +[a-f0-9]+: 48 3b 0d e8 00 20 00 cmp 0x2000e8\(%rip\),%rcx # 200298 <.*> diff --git a/ld/testsuite/ld-x86-64/pr20253-1h.d b/ld/testsuite/ld-x86-64/pr20253-1h.d index d21a7af..132fa03 100644 --- a/ld/testsuite/ld-x86-64/pr20253-1h.d +++ b/ld/testsuite/ld-x86-64/pr20253-1h.d @@ -9,14 +9,14 @@ Disassembly of section .text: 0+40008c <foo>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * 0+40008d <bar>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * 0+40008e <_start>: - +[a-f0-9]+: ff 15 2c 00 20 00 callq \*0x20002c\(%rip\) # 6000c0 <.got> - +[a-f0-9]+: ff 25 2e 00 20 00 jmpq \*0x20002e\(%rip\) # 6000c8 <.got\+0x8> + +[a-f0-9]+: ff 15 2c 00 20 00 call \*0x20002c\(%rip\) # 6000c0 <.got> + +[a-f0-9]+: ff 25 2e 00 20 00 jmp \*0x20002e\(%rip\) # 6000c8 <.got\+0x8> +[a-f0-9]+: 48 c7 05 23 00 20 00 00 00 00 00 movq \$0x0,0x200023\(%rip\) # 6000c8 <.got\+0x8> +[a-f0-9]+: 48 83 3d 13 00 20 00 00 cmpq \$0x0,0x200013\(%rip\) # 6000c0 <.got> +[a-f0-9]+: 48 3b 0d 0c 00 20 00 cmp 0x20000c\(%rip\),%rcx # 6000c0 <.got> diff --git a/ld/testsuite/ld-x86-64/pr20253-1j.d b/ld/testsuite/ld-x86-64/pr20253-1j.d index 9436544..88c9715 100644 --- a/ld/testsuite/ld-x86-64/pr20253-1j.d +++ b/ld/testsuite/ld-x86-64/pr20253-1j.d @@ -9,14 +9,14 @@ Disassembly of section .text: 0+120 <foo>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * 0+121 <bar>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * 0+122 <_start>: - +[a-f0-9]+: ff 15 a8 00 20 00 callq \*0x2000a8\(%rip\) # 2001d0 <.*> - +[a-f0-9]+: ff 25 aa 00 20 00 jmpq \*0x2000aa\(%rip\) # 2001d8 <.*> + +[a-f0-9]+: ff 15 a8 00 20 00 call \*0x2000a8\(%rip\) # 2001d0 <.*> + +[a-f0-9]+: ff 25 aa 00 20 00 jmp \*0x2000aa\(%rip\) # 2001d8 <.*> +[a-f0-9]+: 48 c7 05 9f 00 20 00 00 00 00 00 movq \$0x0,0x20009f\(%rip\) # 2001d8 <.*> +[a-f0-9]+: 48 83 3d 8f 00 20 00 00 cmpq \$0x0,0x20008f\(%rip\) # 2001d0 <.*> +[a-f0-9]+: 48 3b 0d 88 00 20 00 cmp 0x200088\(%rip\),%rcx # 2001d0 <.*> diff --git a/ld/testsuite/ld-x86-64/pr20253-1l.d b/ld/testsuite/ld-x86-64/pr20253-1l.d index 3d37f34..7428a72 100644 --- a/ld/testsuite/ld-x86-64/pr20253-1l.d +++ b/ld/testsuite/ld-x86-64/pr20253-1l.d @@ -9,14 +9,14 @@ Disassembly of section .text: 0+100 <foo>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * 0+101 <bar>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * 0+102 <_start>: - +[a-f0-9]+: ff 15 98 00 20 00 callq \*0x200098\(%rip\) # 2001a0 <.*> - +[a-f0-9]+: ff 25 9a 00 20 00 jmpq \*0x20009a\(%rip\) # 2001a8 <.*> + +[a-f0-9]+: ff 15 98 00 20 00 call \*0x200098\(%rip\) # 2001a0 <.*> + +[a-f0-9]+: ff 25 9a 00 20 00 jmp \*0x20009a\(%rip\) # 2001a8 <.*> +[a-f0-9]+: 48 c7 05 8f 00 20 00 00 00 00 00 movq \$0x0,0x20008f\(%rip\) # 2001a8 <.*> +[a-f0-9]+: 48 83 3d 7f 00 20 00 00 cmpq \$0x0,0x20007f\(%rip\) # 2001a0 <.*> +[a-f0-9]+: 48 3b 0d 78 00 20 00 cmp 0x200078\(%rip\),%rcx # 2001a0 <.*> diff --git a/ld/testsuite/ld-x86-64/pr20830a-now.d b/ld/testsuite/ld-x86-64/pr20830a-now.d index 4610db4..4f284c4 100644 --- a/ld/testsuite/ld-x86-64/pr20830a-now.d +++ b/ld/testsuite/ld-x86-64/pr20830a-now.d @@ -50,19 +50,19 @@ Contents of the .eh_frame section: Disassembly of section .plt: 0+1b0 <.plt>: - +[a-f0-9]+: ff 35 32 0e 20 00 pushq 0x200e32\(%rip\) # 200fe8 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: ff 25 34 0e 20 00 jmpq \*0x200e34\(%rip\) # 200ff0 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 32 0e 20 00 push 0x200e32\(%rip\) # 200fe8 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: ff 25 34 0e 20 00 jmp \*0x200e34\(%rip\) # 200ff0 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) Disassembly of section .plt.got: 0+1c0 <func@plt>: - +[a-f0-9]+: ff 25 32 0e 20 00 jmpq \*0x200e32\(%rip\) # 200ff8 <func> + +[a-f0-9]+: ff 25 32 0e 20 00 jmp \*0x200e32\(%rip\) # 200ff8 <func> +[a-f0-9]+: 66 90 xchg %ax,%ax Disassembly of section .text: 0+1c8 <foo>: - +[a-f0-9]+: e8 f3 ff ff ff callq 1c0 <func@plt> + +[a-f0-9]+: e8 f3 ff ff ff call 1c0 <func@plt> +[a-f0-9]+: 48 8b 05 24 0e 20 00 mov 0x200e24\(%rip\),%rax # 200ff8 <func> #pass diff --git a/ld/testsuite/ld-x86-64/pr20830a.d b/ld/testsuite/ld-x86-64/pr20830a.d index bbffee8..615b59f 100644 --- a/ld/testsuite/ld-x86-64/pr20830a.d +++ b/ld/testsuite/ld-x86-64/pr20830a.d @@ -50,19 +50,19 @@ Contents of the .eh_frame section: Disassembly of section .plt: 0+1b0 <.plt>: - +[a-f0-9]+: ff 35 52 0e 20 00 pushq 0x200e52\(%rip\) # 201008 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: ff 25 54 0e 20 00 jmpq \*0x200e54\(%rip\) # 201010 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 52 0e 20 00 push 0x200e52\(%rip\) # 201008 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: ff 25 54 0e 20 00 jmp \*0x200e54\(%rip\) # 201010 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) Disassembly of section .plt.got: 0+1c0 <func@plt>: - +[a-f0-9]+: ff 25 32 0e 20 00 jmpq \*0x200e32\(%rip\) # 200ff8 <func> + +[a-f0-9]+: ff 25 32 0e 20 00 jmp \*0x200e32\(%rip\) # 200ff8 <func> +[a-f0-9]+: 66 90 xchg %ax,%ax Disassembly of section .text: 0+1c8 <foo>: - +[a-f0-9]+: e8 f3 ff ff ff callq 1c0 <func@plt> + +[a-f0-9]+: e8 f3 ff ff ff call 1c0 <func@plt> +[a-f0-9]+: 48 8b 05 24 0e 20 00 mov 0x200e24\(%rip\),%rax # 200ff8 <func> #pass diff --git a/ld/testsuite/ld-x86-64/pr20830b-now.d b/ld/testsuite/ld-x86-64/pr20830b-now.d index 05a756c..7c7f2f9 100644 --- a/ld/testsuite/ld-x86-64/pr20830b-now.d +++ b/ld/testsuite/ld-x86-64/pr20830b-now.d @@ -42,19 +42,19 @@ Contents of the .eh_frame section: Disassembly of section .plt: 0+120 <.plt>: - +[a-f0-9]+: ff 35 c2 0e 20 00 pushq 0x200ec2\(%rip\) # 200fe8 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: ff 25 c4 0e 20 00 jmpq \*0x200ec4\(%rip\) # 200ff0 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 c2 0e 20 00 push 0x200ec2\(%rip\) # 200fe8 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: ff 25 c4 0e 20 00 jmp \*0x200ec4\(%rip\) # 200ff0 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) Disassembly of section .plt.got: 0+130 <func@plt>: - +[a-f0-9]+: ff 25 c2 0e 20 00 jmpq \*0x200ec2\(%rip\) # 200ff8 <func> + +[a-f0-9]+: ff 25 c2 0e 20 00 jmp \*0x200ec2\(%rip\) # 200ff8 <func> +[a-f0-9]+: 66 90 xchg %ax,%ax Disassembly of section .text: 0+138 <foo>: - +[a-f0-9]+: e8 f3 ff ff ff callq 130 <func@plt> + +[a-f0-9]+: e8 f3 ff ff ff call 130 <func@plt> +[a-f0-9]+: 48 8b 05 b4 0e 20 00 mov 0x200eb4\(%rip\),%rax # 200ff8 <func> #pass diff --git a/ld/testsuite/ld-x86-64/pr20830b.d b/ld/testsuite/ld-x86-64/pr20830b.d index e9a6a1c..3c5d42b 100644 --- a/ld/testsuite/ld-x86-64/pr20830b.d +++ b/ld/testsuite/ld-x86-64/pr20830b.d @@ -42,19 +42,19 @@ Contents of the .eh_frame section: Disassembly of section .plt: 0+120 <.plt>: - +[a-f0-9]+: ff 35 e2 0e 20 00 pushq 0x200ee2\(%rip\) # 201008 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: ff 25 e4 0e 20 00 jmpq \*0x200ee4\(%rip\) # 201010 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 e2 0e 20 00 push 0x200ee2\(%rip\) # 201008 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: ff 25 e4 0e 20 00 jmp \*0x200ee4\(%rip\) # 201010 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) Disassembly of section .plt.got: 0+130 <func@plt>: - +[a-f0-9]+: ff 25 c2 0e 20 00 jmpq \*0x200ec2\(%rip\) # 200ff8 <func> + +[a-f0-9]+: ff 25 c2 0e 20 00 jmp \*0x200ec2\(%rip\) # 200ff8 <func> +[a-f0-9]+: 66 90 xchg %ax,%ax Disassembly of section .text: 0+138 <foo>: - +[a-f0-9]+: e8 f3 ff ff ff callq 130 <func@plt> + +[a-f0-9]+: e8 f3 ff ff ff call 130 <func@plt> +[a-f0-9]+: 48 8b 05 b4 0e 20 00 mov 0x200eb4\(%rip\),%rax # 200ff8 <func> #pass diff --git a/ld/testsuite/ld-x86-64/pr21038a-now.d b/ld/testsuite/ld-x86-64/pr21038a-now.d index 72268fa..1653a68 100644 --- a/ld/testsuite/ld-x86-64/pr21038a-now.d +++ b/ld/testsuite/ld-x86-64/pr21038a-now.d @@ -50,19 +50,19 @@ Contents of the .eh_frame section: Disassembly of section .plt: 0+1b0 <.plt>: - +[a-f0-9]+: ff 35 32 0e 20 00 pushq 0x200e32\(%rip\) # 200fe8 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: f2 ff 25 33 0e 20 00 bnd jmpq \*0x200e33\(%rip\) # 200ff0 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 32 0e 20 00 push 0x200e32\(%rip\) # 200fe8 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: f2 ff 25 33 0e 20 00 bnd jmp \*0x200e33\(%rip\) # 200ff0 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) Disassembly of section .plt.got: 0+1c0 <func@plt>: - +[a-f0-9]+: f2 ff 25 31 0e 20 00 bnd jmpq \*0x200e31\(%rip\) # 200ff8 <func> + +[a-f0-9]+: f2 ff 25 31 0e 20 00 bnd jmp \*0x200e31\(%rip\) # 200ff8 <func> +[a-f0-9]+: 90 nop Disassembly of section .text: 0+1c8 <foo>: - +[a-f0-9]+: e8 f3 ff ff ff callq 1c0 <func@plt> + +[a-f0-9]+: e8 f3 ff ff ff call 1c0 <func@plt> +[a-f0-9]+: 48 8b 05 24 0e 20 00 mov 0x200e24\(%rip\),%rax # 200ff8 <func> #pass diff --git a/ld/testsuite/ld-x86-64/pr21038a.d b/ld/testsuite/ld-x86-64/pr21038a.d index 1cc82e2..6ef8db2 100644 --- a/ld/testsuite/ld-x86-64/pr21038a.d +++ b/ld/testsuite/ld-x86-64/pr21038a.d @@ -49,19 +49,19 @@ Contents of the .eh_frame section: Disassembly of section .plt: 0+1b0 <.plt>: - +[a-f0-9]+: ff 35 52 0e 20 00 pushq 0x200e52\(%rip\) # 201008 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: f2 ff 25 53 0e 20 00 bnd jmpq \*0x200e53\(%rip\) # 201010 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 52 0e 20 00 push 0x200e52\(%rip\) # 201008 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: f2 ff 25 53 0e 20 00 bnd jmp \*0x200e53\(%rip\) # 201010 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) Disassembly of section .plt.got: 0+1c0 <func@plt>: - +[a-f0-9]+: f2 ff 25 31 0e 20 00 bnd jmpq \*0x200e31\(%rip\) # 200ff8 <func> + +[a-f0-9]+: f2 ff 25 31 0e 20 00 bnd jmp \*0x200e31\(%rip\) # 200ff8 <func> +[a-f0-9]+: 90 nop Disassembly of section .text: 0+1c8 <foo>: - +[a-f0-9]+: e8 f3 ff ff ff callq 1c0 <func@plt> + +[a-f0-9]+: e8 f3 ff ff ff call 1c0 <func@plt> +[a-f0-9]+: 48 8b 05 24 0e 20 00 mov 0x200e24\(%rip\),%rax # 200ff8 <func> #pass diff --git a/ld/testsuite/ld-x86-64/pr21038b-now.d b/ld/testsuite/ld-x86-64/pr21038b-now.d index f4a5653..62e80dc 100644 --- a/ld/testsuite/ld-x86-64/pr21038b-now.d +++ b/ld/testsuite/ld-x86-64/pr21038b-now.d @@ -50,21 +50,21 @@ Contents of the .eh_frame section: Disassembly of section .plt: 0+1b0 <.plt>: - +[a-f0-9]+: ff 35 32 0e 20 00 pushq 0x200e32\(%rip\) # 200fe8 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: f2 ff 25 33 0e 20 00 bnd jmpq \*0x200e33\(%rip\) # 200ff0 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 32 0e 20 00 push 0x200e32\(%rip\) # 200fe8 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: f2 ff 25 33 0e 20 00 bnd jmp \*0x200e33\(%rip\) # 200ff0 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmpq 1b0 <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmp 1b0 <.plt> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) Disassembly of section .plt.sec: 0+1d0 <func@plt>: - +[a-f0-9]+: f2 ff 25 21 0e 20 00 bnd jmpq \*0x200e21\(%rip\) # 200ff8 <func> + +[a-f0-9]+: f2 ff 25 21 0e 20 00 bnd jmp \*0x200e21\(%rip\) # 200ff8 <func> +[a-f0-9]+: 90 nop Disassembly of section .text: 0+1d8 <foo>: - +[a-f0-9]+: e8 f3 ff ff ff callq 1d0 <func@plt> + +[a-f0-9]+: e8 f3 ff ff ff call 1d0 <func@plt> #pass diff --git a/ld/testsuite/ld-x86-64/pr21038b.d b/ld/testsuite/ld-x86-64/pr21038b.d index 5ba58db..126c1d2 100644 --- a/ld/testsuite/ld-x86-64/pr21038b.d +++ b/ld/testsuite/ld-x86-64/pr21038b.d @@ -49,21 +49,21 @@ Contents of the .eh_frame section: Disassembly of section .plt: 0+1b0 <.plt>: - +[a-f0-9]+: ff 35 52 0e 20 00 pushq 0x200e52\(%rip\) # 201008 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: f2 ff 25 53 0e 20 00 bnd jmpq \*0x200e53\(%rip\) # 201010 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 52 0e 20 00 push 0x200e52\(%rip\) # 201008 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: f2 ff 25 53 0e 20 00 bnd jmp \*0x200e53\(%rip\) # 201010 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmpq 1b0 <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmp 1b0 <.plt> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) Disassembly of section .plt.sec: 0+1d0 <func@plt>: - +[a-f0-9]+: f2 ff 25 41 0e 20 00 bnd jmpq \*0x200e41\(%rip\) # 201018 <func> + +[a-f0-9]+: f2 ff 25 41 0e 20 00 bnd jmp \*0x200e41\(%rip\) # 201018 <func> +[a-f0-9]+: 90 nop Disassembly of section .text: 0+1d8 <foo>: - +[a-f0-9]+: e8 f3 ff ff ff callq 1d0 <func@plt> + +[a-f0-9]+: e8 f3 ff ff ff call 1d0 <func@plt> #pass diff --git a/ld/testsuite/ld-x86-64/pr21038c-now.d b/ld/testsuite/ld-x86-64/pr21038c-now.d index f8d7a7f..19a4ea8 100644 --- a/ld/testsuite/ld-x86-64/pr21038c-now.d +++ b/ld/testsuite/ld-x86-64/pr21038c-now.d @@ -59,29 +59,29 @@ Contents of the .eh_frame section: Disassembly of section .plt: 0+1f0 <.plt>: - +[a-f0-9]+: ff 35 ea 0d 20 00 pushq 0x200dea\(%rip\) # 200fe0 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: f2 ff 25 eb 0d 20 00 bnd jmpq \*0x200deb\(%rip\) # 200fe8 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 ea 0d 20 00 push 0x200dea\(%rip\) # 200fe0 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: f2 ff 25 eb 0d 20 00 bnd jmp \*0x200deb\(%rip\) # 200fe8 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmpq 1f0 <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmp 1f0 <.plt> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) Disassembly of section .plt.got: 0+210 <func1@plt>: - +[a-f0-9]+: f2 ff 25 e1 0d 20 00 bnd jmpq \*0x200de1\(%rip\) # 200ff8 <func1> + +[a-f0-9]+: f2 ff 25 e1 0d 20 00 bnd jmp \*0x200de1\(%rip\) # 200ff8 <func1> +[a-f0-9]+: 90 nop Disassembly of section .plt.sec: 0+218 <func2@plt>: - +[a-f0-9]+: f2 ff 25 d1 0d 20 00 bnd jmpq \*0x200dd1\(%rip\) # 200ff0 <func2> + +[a-f0-9]+: f2 ff 25 d1 0d 20 00 bnd jmp \*0x200dd1\(%rip\) # 200ff0 <func2> +[a-f0-9]+: 90 nop Disassembly of section .text: 0+220 <foo>: - +[a-f0-9]+: e8 eb ff ff ff callq 210 <func1@plt> - +[a-f0-9]+: e8 ee ff ff ff callq 218 <func2@plt> + +[a-f0-9]+: e8 eb ff ff ff call 210 <func1@plt> + +[a-f0-9]+: e8 ee ff ff ff call 218 <func2@plt> +[a-f0-9]+: 48 8b 05 c7 0d 20 00 mov 0x200dc7\(%rip\),%rax # 200ff8 <func1> #pass diff --git a/ld/testsuite/ld-x86-64/pr21038c.d b/ld/testsuite/ld-x86-64/pr21038c.d index c84eee6..35e7d83 100644 --- a/ld/testsuite/ld-x86-64/pr21038c.d +++ b/ld/testsuite/ld-x86-64/pr21038c.d @@ -58,29 +58,29 @@ Contents of the .eh_frame section: Disassembly of section .plt: 0+1f0 <.plt>: - +[a-f0-9]+: ff 35 12 0e 20 00 pushq 0x200e12\(%rip\) # 201008 <_GLOBAL_OFFSET_TABLE_\+0x8> - +[a-f0-9]+: f2 ff 25 13 0e 20 00 bnd jmpq \*0x200e13\(%rip\) # 201010 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: ff 35 12 0e 20 00 push 0x200e12\(%rip\) # 201008 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: f2 ff 25 13 0e 20 00 bnd jmp \*0x200e13\(%rip\) # 201010 <_GLOBAL_OFFSET_TABLE_\+0x10> +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) - +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 - +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmpq 1f0 <.plt> + +[a-f0-9]+: 68 00 00 00 00 push \$0x0 + +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmp 1f0 <.plt> +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) Disassembly of section .plt.got: 0+210 <func1@plt>: - +[a-f0-9]+: f2 ff 25 e1 0d 20 00 bnd jmpq \*0x200de1\(%rip\) # 200ff8 <func1> + +[a-f0-9]+: f2 ff 25 e1 0d 20 00 bnd jmp \*0x200de1\(%rip\) # 200ff8 <func1> +[a-f0-9]+: 90 nop Disassembly of section .plt.sec: 0+218 <func2@plt>: - +[a-f0-9]+: f2 ff 25 f9 0d 20 00 bnd jmpq \*0x200df9\(%rip\) # 201018 <func2> + +[a-f0-9]+: f2 ff 25 f9 0d 20 00 bnd jmp \*0x200df9\(%rip\) # 201018 <func2> +[a-f0-9]+: 90 nop Disassembly of section .text: 0+220 <foo>: - +[a-f0-9]+: e8 eb ff ff ff callq 210 <func1@plt> - +[a-f0-9]+: e8 ee ff ff ff callq 218 <func2@plt> + +[a-f0-9]+: e8 eb ff ff ff call 210 <func1@plt> + +[a-f0-9]+: e8 ee ff ff ff call 218 <func2@plt> +[a-f0-9]+: 48 8b 05 c7 0d 20 00 mov 0x200dc7\(%rip\),%rax # 200ff8 <func1> #pass diff --git a/ld/testsuite/ld-x86-64/pr23930-x32.d b/ld/testsuite/ld-x86-64/pr23930-x32.d index b01d2b9..16366a9 100644 --- a/ld/testsuite/ld-x86-64/pr23930-x32.d +++ b/ld/testsuite/ld-x86-64/pr23930-x32.d @@ -7,5 +7,5 @@ #... [a-f0-9]+ <main>: [a-f0-9]+: 31 c0 xor %eax,%eax -[a-f0-9]+: c3 retq +[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/pr23930.d b/ld/testsuite/ld-x86-64/pr23930.d index c849b68..215d465 100644 --- a/ld/testsuite/ld-x86-64/pr23930.d +++ b/ld/testsuite/ld-x86-64/pr23930.d @@ -7,5 +7,5 @@ #... [a-f0-9]+ <main>: [a-f0-9]+: 31 c0 xor %eax,%eax -[a-f0-9]+: c3 retq +[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/pr25416-1a.d b/ld/testsuite/ld-x86-64/pr25416-1a.d index 02818b0..3f270a5 100644 --- a/ld/testsuite/ld-x86-64/pr25416-1a.d +++ b/ld/testsuite/ld-x86-64/pr25416-1a.d @@ -12,5 +12,5 @@ Disassembly of section .text: [a-f0-9]+ <_start>: +[a-f0-9]+: 40 8d 05 ([0-9a-f]{2} ){4}[ \t]+rex lea 0x[a-f0-9]+\(%rip\),%eax[ \t]+# [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x[a-f0-9]+> - +[a-f0-9]+: 67 ff 10 callq \*\(%eax\) + +[a-f0-9]+: 67 ff 10 call \*\(%eax\) #pass diff --git a/ld/testsuite/ld-x86-64/pr25416-2a.d b/ld/testsuite/ld-x86-64/pr25416-2a.d index d1b2576..e4ca60d 100644 --- a/ld/testsuite/ld-x86-64/pr25416-2a.d +++ b/ld/testsuite/ld-x86-64/pr25416-2a.d @@ -12,5 +12,5 @@ Disassembly of section .text: [a-f0-9]+ <_start>: +[a-f0-9]+: 48 8d 05 ([0-9a-f]{2} ){4}[ \t]+lea 0x[a-f0-9]+\(%rip\),%rax[ \t]+# [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x[a-f0-9]+> - +[a-f0-9]+: ff 10 callq \*\(%rax\) + +[a-f0-9]+: ff 10 call \*\(%rax\) #pass diff --git a/ld/testsuite/ld-x86-64/pr26018.d b/ld/testsuite/ld-x86-64/pr26018.d index c2003aa..1f9ba4b 100644 --- a/ld/testsuite/ld-x86-64/pr26018.d +++ b/ld/testsuite/ld-x86-64/pr26018.d @@ -8,8 +8,8 @@ Disassembly of section .text: [0-9a-f]+ <_start>: - +[a-f0-9]+: e8 00 00 00 00 callq [0-9a-f]+ <foo> + +[a-f0-9]+: e8 00 00 00 00 call [0-9a-f]+ <foo> [0-9a-f]+ <foo>: - +[a-f0-9]+: c3 retq + +[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/protected2-k1om.d b/ld/testsuite/ld-x86-64/protected2-k1om.d index 560f00e..cda2c95 100644 --- a/ld/testsuite/ld-x86-64/protected2-k1om.d +++ b/ld/testsuite/ld-x86-64/protected2-k1om.d @@ -10,9 +10,9 @@ Disassembly of section .text: 0+[a-f0-9]+ <foo>: -[ ]*[a-f0-9]+: c3 retq +[ ]*[a-f0-9]+: c3 ret * 0+[a-f0-9]+ <bar>: -[ ]*[a-f0-9]+: e8 fa ff ff ff callq [a-f0-9]+ <foo> -[ ]*[a-f0-9]+: c3 retq +[ ]*[a-f0-9]+: e8 fa ff ff ff call [a-f0-9]+ <foo> +[ ]*[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/protected2-l1om.d b/ld/testsuite/ld-x86-64/protected2-l1om.d index 9142f8e..ffacee1 100644 --- a/ld/testsuite/ld-x86-64/protected2-l1om.d +++ b/ld/testsuite/ld-x86-64/protected2-l1om.d @@ -10,9 +10,9 @@ Disassembly of section .text: 0+[a-f0-9]+ <foo>: -[ ]*[a-f0-9]+: c3 retq +[ ]*[a-f0-9]+: c3 ret * 0+[a-f0-9]+ <bar>: -[ ]*[a-f0-9]+: e8 fa ff ff ff callq [a-f0-9]+ <foo> -[ ]*[a-f0-9]+: c3 retq +[ ]*[a-f0-9]+: e8 fa ff ff ff call [a-f0-9]+ <foo> +[ ]*[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/protected2.d b/ld/testsuite/ld-x86-64/protected2.d index 2e91b17..1dd75fb 100644 --- a/ld/testsuite/ld-x86-64/protected2.d +++ b/ld/testsuite/ld-x86-64/protected2.d @@ -8,9 +8,9 @@ Disassembly of section .text: 0+[a-f0-9]+ <foo>: -[ ]*[a-f0-9]+: c3 retq +[ ]*[a-f0-9]+: c3 ret * 0+[a-f0-9]+ <bar>: -[ ]*[a-f0-9]+: e8 fa ff ff ff callq [a-f0-9]+ <foo> -[ ]*[a-f0-9]+: c3 retq +[ ]*[a-f0-9]+: e8 fa ff ff ff call [a-f0-9]+ <foo> +[ ]*[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/protected3.d b/ld/testsuite/ld-x86-64/protected3.d index 0c60167..92a2ab3 100644 --- a/ld/testsuite/ld-x86-64/protected3.d +++ b/ld/testsuite/ld-x86-64/protected3.d @@ -10,5 +10,5 @@ Disassembly of section .text: 0+[a-f0-9]+ <bar>: [ ]*[a-f0-9]+: 48 8b 05 ([0-9a-f]{2} ){4} * mov 0x[a-f0-9]+\(%rip\),%rax # [a-f0-9]+ <.*> [ ]*[a-f0-9]+: 8b 00 mov \(%rax\),%eax -[ ]*[a-f0-9]+: c3 retq * +[ ]*[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/protected8.d b/ld/testsuite/ld-x86-64/protected8.d index 22a36ac..72a57fcd 100644 --- a/ld/testsuite/ld-x86-64/protected8.d +++ b/ld/testsuite/ld-x86-64/protected8.d @@ -9,5 +9,5 @@ Disassembly of section .text: 0+[a-f0-9]+ <bar>: [ ]*[a-f0-9]+: 8b 05 ([0-9a-f]{2} ){4} * mov 0x[a-f0-9]+\(%rip\),%eax # [a-f0-9]+ <foo> -[ ]*[a-f0-9]+: c3 retq * +[ ]*[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/tlsbin.dd b/ld/testsuite/ld-x86-64/tlsbin.dd index 6bc7ca2..3c642ab 100644 --- a/ld/testsuite/ld-x86-64/tlsbin.dd +++ b/ld/testsuite/ld-x86-64/tlsbin.dd @@ -172,8 +172,8 @@ Disassembly of section .text: +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * - +[0-9a-f]+: c9[ ]+leaveq * - +[0-9a-f]+: c3[ ]+retq * + +[0-9a-f]+: c9[ ]+leave * + +[0-9a-f]+: c3[ ]+ret * [0-9a-f]+ <_start>: +[0-9a-f]+: 55[ ]+push %rbp @@ -306,5 +306,5 @@ Disassembly of section .text: # LE, large model +[0-9a-f]+: 48 ba a5 ff ff ff ff[ ]+movabs \$0xffffffffffffffa5,%rdx +[0-9a-f]+: ff ff ff * - +[0-9a-f]+: c9[ ]+leaveq * - +[0-9a-f]+: c3[ ]+retq * + +[0-9a-f]+: c9[ ]+leave * + +[0-9a-f]+: c3[ ]+ret * diff --git a/ld/testsuite/ld-x86-64/tlsbin2.dd b/ld/testsuite/ld-x86-64/tlsbin2.dd index 0010d38..0ba373c 100644 --- a/ld/testsuite/ld-x86-64/tlsbin2.dd +++ b/ld/testsuite/ld-x86-64/tlsbin2.dd @@ -172,8 +172,8 @@ Disassembly of section .text: +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * - +[0-9a-f]+: c9[ ]+leaveq * - +[0-9a-f]+: c3[ ]+retq * + +[0-9a-f]+: c9[ ]+leave * + +[0-9a-f]+: c3[ ]+ret * [0-9a-f]+ <_start>: +[0-9a-f]+: 55[ ]+push %rbp @@ -306,5 +306,5 @@ Disassembly of section .text: # LE, large model +[0-9a-f]+: 48 ba a5 ff ff ff ff[ ]+movabs \$0xffffffffffffffa5,%rdx +[0-9a-f]+: ff ff ff * - +[0-9a-f]+: c9[ ]+leaveq * - +[0-9a-f]+: c3[ ]+retq * + +[0-9a-f]+: c9[ ]+leave * + +[0-9a-f]+: c3[ ]+ret * diff --git a/ld/testsuite/ld-x86-64/tlsbindesc.dd b/ld/testsuite/ld-x86-64/tlsbindesc.dd index 50dc6d1..5bdb659 100644 --- a/ld/testsuite/ld-x86-64/tlsbindesc.dd +++ b/ld/testsuite/ld-x86-64/tlsbindesc.dd @@ -163,8 +163,8 @@ Disassembly of section .text: +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * - +[0-9a-f]+: c9[ ]+leaveq * - +[0-9a-f]+: c3[ ]+retq * + +[0-9a-f]+: c9[ ]+leave * + +[0-9a-f]+: c3[ ]+ret * [0-9a-f]+ <_start>: +[0-9a-f]+: 55[ ]+push %rbp @@ -297,5 +297,5 @@ Disassembly of section .text: # LE, large model +[0-9a-f]+: 48 ba a5 ff ff ff ff[ ]+movabs \$0xffffffffffffffa5,%rdx +[0-9a-f]+: ff ff ff * - +[0-9a-f]+: c9[ ]+leaveq * - +[0-9a-f]+: c3[ ]+retq * + +[0-9a-f]+: c9[ ]+leave * + +[0-9a-f]+: c3[ ]+ret * diff --git a/ld/testsuite/ld-x86-64/tlsdesc.dd b/ld/testsuite/ld-x86-64/tlsdesc.dd index c9b1cf8..1a70c62 100644 --- a/ld/testsuite/ld-x86-64/tlsdesc.dd +++ b/ld/testsuite/ld-x86-64/tlsdesc.dd @@ -19,7 +19,7 @@ Disassembly of section .text: # GD +[0-9a-f]+: 48 8d 05 ([0-9a-f]{2} ){4}[ ]+lea 0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*> # -> R_X86_64_TLSDESC sg1 - +[0-9a-f]+: ff 10[ ]+callq \*\(%rax\) + +[0-9a-f]+: ff 10[ ]+call \*\(%rax\) +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * @@ -35,7 +35,7 @@ Disassembly of section .text: # GD against local variable +[0-9a-f]+: 48 8d 05 ([0-9a-f]{2} ){4}[ ]+lea 0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x18> # -> R_X86_64_TLSDESC [0 0x2000000000000000] - +[0-9a-f]+: ff 10[ ]+callq \*\(%rax\) + +[0-9a-f]+: ff 10[ ]+call \*\(%rax\) +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * @@ -51,7 +51,7 @@ Disassembly of section .text: # GD against hidden and local variable +[0-9a-f]+: 48 8d 05 ([0-9a-f]{2} ){4}[ ]+lea 0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x58> # -> R_X86_64_TLSDESC [0 0x4000000000000000] - +[0-9a-f]+: ff 10[ ]+callq \*\(%rax\) + +[0-9a-f]+: ff 10[ ]+call \*\(%rax\) +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * @@ -67,7 +67,7 @@ Disassembly of section .text: # GD against hidden but not local variable +[0-9a-f]+: 48 8d 05 ([0-9a-f]{2} ){4}[ ]+lea 0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x28> # -> R_X86_64_TLSDESC [0 0x6000000000000000] - +[0-9a-f]+: ff 10[ ]+callq \*\(%rax\) + +[0-9a-f]+: ff 10[ ]+call \*\(%rax\) +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * @@ -83,7 +83,7 @@ Disassembly of section .text: # LD +[0-9a-f]+: 48 8d 05 ([0-9a-f]{2} ){4}[ ]+lea 0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x38> # -> R_X86_64_TLSDESC [0 0x000000000000000] - +[0-9a-f]+: ff 10[ ]+callq \*\(%rax\) + +[0-9a-f]+: ff 10[ ]+call \*\(%rax\) +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 48 8d 90 20 00 00 00[ ]+lea 0x20\(%rax\),%rdx @@ -195,5 +195,5 @@ Disassembly of section .text: +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * - +[0-9a-f]+: c9[ ]+leaveq * - +[0-9a-f]+: c3[ ]+retq * + +[0-9a-f]+: c9[ ]+leave * + +[0-9a-f]+: c3[ ]+ret * diff --git a/ld/testsuite/ld-x86-64/tlsdesc.pd b/ld/testsuite/ld-x86-64/tlsdesc.pd index 08b4fa3..bd60a23 100644 --- a/ld/testsuite/ld-x86-64/tlsdesc.pd +++ b/ld/testsuite/ld-x86-64/tlsdesc.pd @@ -10,10 +10,10 @@ Disassembly of section .plt: [0-9a-f]+ <.plt>: - [0-9a-f]+: ff 35 .. .. 20 00 pushq .*\(%rip\) # 201358 <_GLOBAL_OFFSET_TABLE_\+0x8> - [0-9a-f]+: ff 25 .. .. 20 00 jmpq \*.*\(%rip\) # 201360 <_GLOBAL_OFFSET_TABLE_\+0x10> + [0-9a-f]+: ff 35 .. .. 20 00 push .*\(%rip\) # 201358 <_GLOBAL_OFFSET_TABLE_\+0x8> + [0-9a-f]+: ff 25 .. .. 20 00 jmp \*.*\(%rip\) # 201360 <_GLOBAL_OFFSET_TABLE_\+0x10> [0-9a-f]+: 0f 1f 40 00 nopl 0x0\(%rax\) [0-9a-f]+: f3 0f 1e fa endbr64 - [0-9a-f]+: ff 35 .. .. 20 00 pushq .*\(%rip\) # 201358 <_GLOBAL_OFFSET_TABLE_\+0x8> - [0-9a-f]+: ff 25 .. .. 20 00 jmpq \*.*\(%rip\) # 201348 <.*> + [0-9a-f]+: ff 35 .. .. 20 00 push .*\(%rip\) # 201358 <_GLOBAL_OFFSET_TABLE_\+0x8> + [0-9a-f]+: ff 25 .. .. 20 00 jmp \*.*\(%rip\) # 201348 <.*> diff --git a/ld/testsuite/ld-x86-64/tlsgd10.dd b/ld/testsuite/ld-x86-64/tlsgd10.dd index 7a69f61..e27ee8b 100644 --- a/ld/testsuite/ld-x86-64/tlsgd10.dd +++ b/ld/testsuite/ld-x86-64/tlsgd10.dd @@ -19,5 +19,5 @@ Disassembly of section .text: [ ]*[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%rax,%rax,1\) [ ]*[a-f0-9]+: 41 5f pop %r15 [ ]*[a-f0-9]+: 41 5f pop %r15 -[ ]*[a-f0-9]+: c3 retq +[ ]*[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/tlsgd7.dd b/ld/testsuite/ld-x86-64/tlsgd7.dd index dfbe284..d6edddd 100644 --- a/ld/testsuite/ld-x86-64/tlsgd7.dd +++ b/ld/testsuite/ld-x86-64/tlsgd7.dd @@ -19,5 +19,5 @@ Disassembly of section .text: [ ]*[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%rax,%rax,1\) [ ]*[a-f0-9]+: 5b pop %rbx [ ]*[a-f0-9]+: 5b pop %rbx -[ ]*[a-f0-9]+: c3 retq +[ ]*[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/tlsgd8.dd b/ld/testsuite/ld-x86-64/tlsgd8.dd index f9cac0b..a739a3c 100644 --- a/ld/testsuite/ld-x86-64/tlsgd8.dd +++ b/ld/testsuite/ld-x86-64/tlsgd8.dd @@ -19,5 +19,5 @@ Disassembly of section .text: [ ]*[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%rax,%rax,1\) [ ]*[a-f0-9]+: 5b pop %rbx [ ]*[a-f0-9]+: 5b pop %rbx -[ ]*[a-f0-9]+: c3 retq +[ ]*[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/tlsgd9.dd b/ld/testsuite/ld-x86-64/tlsgd9.dd index ebfdf83..0e705d6 100644 --- a/ld/testsuite/ld-x86-64/tlsgd9.dd +++ b/ld/testsuite/ld-x86-64/tlsgd9.dd @@ -19,5 +19,5 @@ Disassembly of section .text: [ ]*[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%rax,%rax,1\) [ ]*[a-f0-9]+: 41 5f pop %r15 [ ]*[a-f0-9]+: 41 5f pop %r15 -[ ]*[a-f0-9]+: c3 retq +[ ]*[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/tlsgdesc.dd b/ld/testsuite/ld-x86-64/tlsgdesc.dd index d0a274b..d1855f6 100644 --- a/ld/testsuite/ld-x86-64/tlsgdesc.dd +++ b/ld/testsuite/ld-x86-64/tlsgdesc.dd @@ -41,7 +41,7 @@ Disassembly of section .text: +[0-9a-f]+: 66 48 8d 3d ([0-9a-f]{2} ){3}[ ]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*> +[0-9a-f]+: [0-9a-f]{2} * # -> R_X86_64_DTPMOD64 sG1 - +[0-9a-f]+: 66 66 48 e8 ([0-9a-f]{2} ){3}[ ]+data16 data16 rex.W callq [0-9a-f]+ <__tls_get_addr@plt> + +[0-9a-f]+: 66 66 48 e8 ([0-9a-f]{2} ){3}[ ]+data16 data16 rex\.W call [0-9a-f]+ <__tls_get_addr@plt> +[0-9a-f]+: [0-9a-f]{2} * # -> R_X86_64_JUMP_SLOT __tls_get_addr +[0-9a-f]+: 90[ ]+nop * @@ -50,7 +50,7 @@ Disassembly of section .text: +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 48 8d 05 ([0-9a-f]{2} ){4}[ ]+lea 0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*> # -> R_X86_64_TLSDESC sG1 - +[0-9a-f]+: ff 10[ ]+callq \*\(%rax\) + +[0-9a-f]+: ff 10[ ]+call \*\(%rax\) +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * @@ -58,7 +58,7 @@ Disassembly of section .text: # GD, desc first +[0-9a-f]+: 48 8d 05 ([0-9a-f]{2} ){4}[ ]+lea 0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*> # -> R_X86_64_TLSDESC sG2 - +[0-9a-f]+: ff 10[ ]+callq \*\(%rax\) + +[0-9a-f]+: ff 10[ ]+call \*\(%rax\) +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * @@ -66,7 +66,7 @@ Disassembly of section .text: +[0-9a-f]+: 66 48 8d 3d ([0-9a-f]{2} ){3}[ ]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*> +[0-9a-f]+: [0-9a-f]{2} * # -> R_X86_64_DTPMOD64 sG2 - +[0-9a-f]+: 66 66 48 e8 ([0-9a-f]{2} ){3}[ ]+data16 data16 rex.W callq [0-9a-f]+ <__tls_get_addr@plt> + +[0-9a-f]+: 66 66 48 e8 ([0-9a-f]{2} ){3}[ ]+data16 data16 rex\.W call [0-9a-f]+ <__tls_get_addr@plt> +[0-9a-f]+: [0-9a-f]{2} * # -> R_X86_64_JUMP_SLOT __tls_get_addr +[0-9a-f]+: 90[ ]+nop * @@ -159,5 +159,5 @@ Disassembly of section .text: +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * +[0-9a-f]+: 90[ ]+nop * - +[0-9a-f]+: c9[ ]+leaveq * - +[0-9a-f]+: c3[ ]+retq * + +[0-9a-f]+: c9[ ]+leave * + +[0-9a-f]+: c3[ ]+ret * diff --git a/ld/testsuite/ld-x86-64/tlsld3.dd b/ld/testsuite/ld-x86-64/tlsld3.dd index f9c8de2..75ac2bf 100644 --- a/ld/testsuite/ld-x86-64/tlsld3.dd +++ b/ld/testsuite/ld-x86-64/tlsld3.dd @@ -19,5 +19,5 @@ Disassembly of section .text: [ ]*[a-f0-9]+: 8b 80 fc ff ff ff mov -0x4\(%rax\),%eax [ ]*[a-f0-9]+: 5b pop %rbx [ ]*[a-f0-9]+: 5b pop %rbx -[ ]*[a-f0-9]+: c3 retq +[ ]*[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/tlsld4.dd b/ld/testsuite/ld-x86-64/tlsld4.dd index 0121cc4..711f507 100644 --- a/ld/testsuite/ld-x86-64/tlsld4.dd +++ b/ld/testsuite/ld-x86-64/tlsld4.dd @@ -19,5 +19,5 @@ Disassembly of section .text: [ ]*[a-f0-9]+: 8b 80 fc ff ff ff mov -0x4\(%rax\),%eax [ ]*[a-f0-9]+: 41 5f pop %r15 [ ]*[a-f0-9]+: 41 5f pop %r15 -[ ]*[a-f0-9]+: c3 retq +[ ]*[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/tlspic.dd b/ld/testsuite/ld-x86-64/tlspic.dd index 88026c1..fce2ca6 100644 --- a/ld/testsuite/ld-x86-64/tlspic.dd +++ b/ld/testsuite/ld-x86-64/tlspic.dd @@ -20,7 +20,7 @@ Disassembly of section .text: +1008: 66 48 8d 3d ([0-9a-f]{2} ){3}[ ]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*> +100f: [0-9a-f ]+ # -> R_X86_64_DTPMOD64 sg1 - +1010: 66 66 48 e8 [0-9a-f ]+data16 data16 rex.W callq [0-9a-f]+ <.*> + +1010: 66 66 48 e8 [0-9a-f ]+data16 data16 rex\.W call [0-9a-f]+ <.*> # -> R_X86_64_JUMP_SLOT __tls_get_addr +1017: [0-9a-f ]+ +1018: 90[ ]+nop * @@ -40,7 +40,7 @@ Disassembly of section .text: +1030: 66 48 8d 3d ([0-9a-f]{2} ){3}[ ]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*> +1037: [0-9a-f ]+ # -> R_X86_64_DTPMOD64 [0 0x2000000000000000] - +1038: 66 66 48 e8 [0-9a-f ]+data16 data16 rex.W callq [0-9a-f]+ <.*> + +1038: 66 66 48 e8 [0-9a-f ]+data16 data16 rex\.W call [0-9a-f]+ <.*> # -> R_X86_64_JUMP_SLOT __tls_get_addr +103f: [0-9a-f ]+ +1040: 90[ ]+nop * @@ -60,7 +60,7 @@ Disassembly of section .text: +1058: 66 48 8d 3d ([0-9a-f]{2} ){3}[ ]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*> +105f: [0-9a-f ]+ # -> R_X86_64_DTPMOD64 [0 0x4000000000000000] - +1060: 66 66 48 e8 [0-9a-f ]+data16 data16 rex.W callq [0-9a-f]+ <.*> + +1060: 66 66 48 e8 [0-9a-f ]+data16 data16 rex\.W call [0-9a-f]+ <.*> # -> R_X86_64_JUMP_SLOT __tls_get_addr +1067: [0-9a-f ]+ +1068: 90[ ]+nop * @@ -80,7 +80,7 @@ Disassembly of section .text: +1080: 66 48 8d 3d ([0-9a-f]{2} ){3}[ ]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*> +1087: [0-9a-f ]+ # -> R_X86_64_DTPMOD64 [0 0x6000000000000000] - +1088: 66 66 48 e8 [0-9a-f ]+data16 data16 rex.W callq [0-9a-f]+ <.*> + +1088: 66 66 48 e8 [0-9a-f ]+data16 data16 rex\.W call [0-9a-f]+ <.*> # -> R_X86_64_JUMP_SLOT __tls_get_addr +108f: [0-9a-f ]+ +1090: 90[ ]+nop * @@ -99,7 +99,7 @@ Disassembly of section .text: # LD +10a8: 48 8d 3d ([0-9a-f]{2} ){4}[ ]+lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*> # -> R_X86_64_DTPMOD64 [0 0x000000000000000] - +10af: e8 [0-9a-f ]+callq [0-9a-f]+ <.*> + +10af: e8 [0-9a-f ]+call [0-9a-f]+ <.*> # -> R_X86_64_JUMP_SLOT __tls_get_addr +10b4: 90[ ]+nop * +10b5: 90[ ]+nop * @@ -114,7 +114,7 @@ Disassembly of section .text: # LD against hidden and local variables +10ca: 48 8d 3d ([0-9a-f]{2} ){4}[ ]+lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*> # -> R_X86_64_DTPMOD64 [0 0x000000000000000] - +10d1: e8 [0-9a-f ]+callq [0-9a-f]+ <.*> + +10d1: e8 [0-9a-f ]+call [0-9a-f]+ <.*> # -> R_X86_64_JUMP_SLOT __tls_get_addr +10d6: 90[ ]+nop * +10d7: 90[ ]+nop * @@ -129,7 +129,7 @@ Disassembly of section .text: # LD against hidden but not local variables +10ec: 48 8d 3d ([0-9a-f]{2} ){4}[ ]+lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*> # -> R_X86_64_DTPMOD64 [0 0x000000000000000] - +10f3: e8 [0-9a-f ]+callq [0-9a-f]+ <.*> + +10f3: e8 [0-9a-f ]+call [0-9a-f]+ <.*> # -> R_X86_64_JUMP_SLOT __tls_get_addr +10f8: 90[ ]+nop * +10f9: 90[ ]+nop * @@ -243,7 +243,7 @@ Disassembly of section .text: # -> R_X86_64_JUMP_SLOT __tls_get_addr +11d0: ([0-9a-f]{2} ){3} +11d3: 48 01 d8[ ]+add %rbx,%rax - +11d6: ff d0[ ]+callq \*%rax + +11d6: ff d0[ ]+call \*%rax +11d8: 90[ ]+nop * +11d9: 90[ ]+nop * +11da: 90[ ]+nop * @@ -266,7 +266,7 @@ Disassembly of section .text: # -> R_X86_64_JUMP_SLOT __tls_get_addr +1204: ([0-9a-f]{2} ){3} +1207: 48 01 d8[ ]+add %rbx,%rax - +120a: ff d0[ ]+callq \*%rax + +120a: ff d0[ ]+call \*%rax +120c: 90[ ]+nop * +120d: 90[ ]+nop * +120e: 90[ ]+nop * @@ -288,7 +288,7 @@ Disassembly of section .text: # -> R_X86_64_JUMP_SLOT __tls_get_addr +1238: ([0-9a-f]{2} ){3} +123b: 48 01 d8[ ]+add %rbx,%rax - +123e: ff d0[ ]+callq \*%rax + +123e: ff d0[ ]+call \*%rax +1240: 90[ ]+nop * +1241: 90[ ]+nop * +1242: 90[ ]+nop * @@ -310,7 +310,7 @@ Disassembly of section .text: # -> R_X86_64_JUMP_SLOT __tls_get_addr +126c: ([0-9a-f]{2} ){3} +126f: 48 01 d8[ ]+add %rbx,%rax - +1272: ff d0[ ]+callq \*%rax + +1272: ff d0[ ]+call \*%rax +1274: 90[ ]+nop * +1275: 90[ ]+nop * +1276: 90[ ]+nop * @@ -332,7 +332,7 @@ Disassembly of section .text: # -> R_X86_64_JUMP_SLOT __tls_get_addr +12a0: ([0-9a-f]{2} ){3} +12a3: 48 01 d8[ ]+add %rbx,%rax - +12a6: ff d0[ ]+callq \*%rax + +12a6: ff d0[ ]+call \*%rax +12a8: 90[ ]+nop * +12a9: 90[ ]+nop * +12aa: 48 8d 90 20 00 00 00[ ]+lea 0x20\(%rax\),%rdx @@ -350,7 +350,7 @@ Disassembly of section .text: # -> R_X86_64_JUMP_SLOT __tls_get_addr +12cc: ([0-9a-f]{2} ){3} +12cf: 48 01 d8[ ]+add %rbx,%rax - +12d2: ff d0[ ]+callq \*%rax + +12d2: ff d0[ ]+call \*%rax +12d4: 90[ ]+nop * +12d5: 90[ ]+nop * +12d6: 48 8d 90 40 00 00 00[ ]+lea 0x40\(%rax\),%rdx @@ -368,7 +368,7 @@ Disassembly of section .text: # -> R_X86_64_JUMP_SLOT __tls_get_addr +12f8: ([0-9a-f]{2} ){3} +12fb: 48 01 d8[ ]+add %rbx,%rax - +12fe: ff d0[ ]+callq \*%rax + +12fe: ff d0[ ]+call \*%rax +1300: 90[ ]+nop * +1301: 90[ ]+nop * +1302: 4c 8d a0 60 00 00 00[ ]+lea 0x60\(%rax\),%r12 @@ -381,5 +381,5 @@ Disassembly of section .text: +1315: 90[ ]+nop * +1316: 5b[ ]+pop %rbx +1317: 5b[ ]+pop %rbx - +1318: c9[ ]+leaveq - +1319: c3[ ]+retq + +1318: c9[ ]+leave * + +1319: c3[ ]+ret * diff --git a/ld/testsuite/ld-x86-64/tlspic2.dd b/ld/testsuite/ld-x86-64/tlspic2.dd index 596fcb4..2db102b 100644 --- a/ld/testsuite/ld-x86-64/tlspic2.dd +++ b/ld/testsuite/ld-x86-64/tlspic2.dd @@ -20,7 +20,7 @@ Disassembly of section .text: +1008: 66 48 8d 3d ([0-9a-f]{2} ){3}[ ]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*> +100f: [0-9a-f ]+ # -> R_X86_64_DTPMOD64 sg1 - +1010: 66 48 ff [0-9a-f ]+data16 rex\.W callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +1010: 66 48 ff [0-9a-f ]+data16 rex\.W call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> # -> R_X86_64_GLOB_DAT __tls_get_addr +1017: [0-9a-f ]+ +1018: 90[ ]+nop * @@ -40,7 +40,7 @@ Disassembly of section .text: +1030: 66 48 8d 3d ([0-9a-f]{2} ){3}[ ]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*> +1037: [0-9a-f ]+ # -> R_X86_64_DTPMOD64 [0 0x2000000000000000] - +1038: 66 48 ff [0-9a-f ]+data16 rex\.W callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +1038: 66 48 ff [0-9a-f ]+data16 rex\.W call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> # -> R_X86_64_GLOB_DAT __tls_get_addr +103f: [0-9a-f ]+ +1040: 90[ ]+nop * @@ -60,7 +60,7 @@ Disassembly of section .text: +1058: 66 48 8d 3d ([0-9a-f]{2} ){3}[ ]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*> +105f: [0-9a-f ]+ # -> R_X86_64_DTPMOD64 [0 0x4000000000000000] - +1060: 66 48 ff [0-9a-f ]+data16 rex\.W callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +1060: 66 48 ff [0-9a-f ]+data16 rex\.W call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> # -> R_X86_64_GLOB_DAT __tls_get_addr +1067: [0-9a-f ]+ +1068: 90[ ]+nop * @@ -80,7 +80,7 @@ Disassembly of section .text: +1080: 66 48 8d 3d ([0-9a-f]{2} ){3}[ ]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*> +1087: [0-9a-f ]+ # -> R_X86_64_DTPMOD64 [0 0x6000000000000000] - +1088: 66 48 ff [0-9a-f ]+data16 rex\.W callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +1088: 66 48 ff [0-9a-f ]+data16 rex\.W call \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> # -> R_X86_64_GLOB_DAT __tls_get_addr +108f: [0-9a-f ]+ +1090: 90[ ]+nop * @@ -99,7 +99,7 @@ Disassembly of section .text: # LD +10a8: 48 8d 3d ([0-9a-f]{2} ){4}[ ]+lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*> # -> R_X86_64_DTPMOD64 [0 0x000000000000000] - +10af: ff [0-9a-f ]+callq[ ]+\*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +10af: ff [0-9a-f ]+call[ ]+\*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> # -> R_X86_64_GLOB_DAT __tls_get_addr +10b5: 90[ ]+nop * +10b6: 48 8d 90 20 00 00 00[ ]+lea 0x20\(%rax\),%rdx @@ -113,7 +113,7 @@ Disassembly of section .text: # LD against hidden and local variables +10ca: 48 8d 3d ([0-9a-f]{2} ){4}[ ]+lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*> # -> R_X86_64_DTPMOD64 [0 0x000000000000000] - +10d1: ff [0-9a-f ]+callq[ ]+\*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +10d1: ff [0-9a-f ]+call[ ]+\*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> # -> R_X86_64_GLOB_DAT __tls_get_addr +10d7: 90[ ]+nop * +10d8: 48 8d 90 40 00 00 00[ ]+lea 0x40\(%rax\),%rdx @@ -127,7 +127,7 @@ Disassembly of section .text: # LD against hidden but not local variables +10ec: 48 8d 3d ([0-9a-f]{2} ){4}[ ]+lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*> # -> R_X86_64_DTPMOD64 [0 0x000000000000000] - +10f3: ff [0-9a-f ]+callq[ ]+\*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> + +10f3: ff [0-9a-f ]+call[ ]+\*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*> # -> R_X86_64_GLOB_DAT __tls_get_addr +10f9: 90[ ]+nop * +10fa: 4c 8d a0 60 00 00 00[ ]+lea 0x60\(%rax\),%r12 @@ -238,7 +238,7 @@ Disassembly of section .text: # -> R_X86_64_GLOB_DAT __tls_get_addr +11d0: ([0-9a-f]{2} ){3} +11d3: 4c 01 f8[ ]+add %r15,%rax - +11d6: ff d0[ ]+callq \*%rax + +11d6: ff d0[ ]+call \*%rax +11d8: 90[ ]+nop * +11d9: 90[ ]+nop * +11da: 90[ ]+nop * @@ -261,7 +261,7 @@ Disassembly of section .text: # -> R_X86_64_GLOB_DAT __tls_get_addr +1204: ([0-9a-f]{2} ){3} +1207: 4c 01 f8[ ]+add %r15,%rax - +120a: ff d0[ ]+callq \*%rax + +120a: ff d0[ ]+call \*%rax +120c: 90[ ]+nop * +120d: 90[ ]+nop * +120e: 90[ ]+nop * @@ -283,7 +283,7 @@ Disassembly of section .text: # -> R_X86_64_GLOB_DAT __tls_get_addr +1238: ([0-9a-f]{2} ){3} +123b: 4c 01 f8[ ]+add %r15,%rax - +123e: ff d0[ ]+callq \*%rax + +123e: ff d0[ ]+call \*%rax +1240: 90[ ]+nop * +1241: 90[ ]+nop * +1242: 90[ ]+nop * @@ -305,7 +305,7 @@ Disassembly of section .text: # -> R_X86_64_GLOB_DAT __tls_get_addr +126c: ([0-9a-f]{2} ){3} +126f: 4c 01 f8[ ]+add %r15,%rax - +1272: ff d0[ ]+callq \*%rax + +1272: ff d0[ ]+call \*%rax +1274: 90[ ]+nop * +1275: 90[ ]+nop * +1276: 90[ ]+nop * @@ -327,7 +327,7 @@ Disassembly of section .text: # -> R_X86_64_GLOB_DAT __tls_get_addr +12a0: ([0-9a-f]{2} ){3} +12a3: 4c 01 f8[ ]+add %r15,%rax - +12a6: ff d0[ ]+callq \*%rax + +12a6: ff d0[ ]+call \*%rax +12a8: 90[ ]+nop * +12a9: 90[ ]+nop * +12aa: 48 8d 90 20 00 00 00[ ]+lea 0x20\(%rax\),%rdx @@ -345,7 +345,7 @@ Disassembly of section .text: # -> R_X86_64_GLOB_DAT __tls_get_addr +12cc: ([0-9a-f]{2} ){3} +12cf: 4c 01 f8[ ]+add %r15,%rax - +12d2: ff d0[ ]+callq \*%rax + +12d2: ff d0[ ]+call \*%rax +12d4: 90[ ]+nop * +12d5: 90[ ]+nop * +12d6: 48 8d 90 40 00 00 00[ ]+lea 0x40\(%rax\),%rdx @@ -363,7 +363,7 @@ Disassembly of section .text: # -> R_X86_64_GLOB_DAT __tls_get_addr +12f8: ([0-9a-f]{2} ){3} +12fb: 4c 01 f8[ ]+add %r15,%rax - +12fe: ff d0[ ]+callq \*%rax + +12fe: ff d0[ ]+call \*%rax +1300: 90[ ]+nop * +1301: 90[ ]+nop * +1302: 4c 8d a0 60 00 00 00[ ]+lea 0x60\(%rax\),%r12 @@ -374,5 +374,5 @@ Disassembly of section .text: +1313: 90[ ]+nop * +1314: 41 5f[ ]+pop %r15 +1316: 41 5f[ ]+pop %r15 - +1318: c9[ ]+leaveq - +1319: c3[ ]+retq + +1318: c9[ ]+leave * + +1319: c3[ ]+ret * diff --git a/ld/testsuite/ld-x86-64/tlspie2b.d b/ld/testsuite/ld-x86-64/tlspie2b.d index 6f96fa3..560e81e 100644 --- a/ld/testsuite/ld-x86-64/tlspie2b.d +++ b/ld/testsuite/ld-x86-64/tlspie2b.d @@ -9,7 +9,7 @@ Disassembly of section .text: [a-f0-9]+ <__tls_get_addr>: -[ ]*[a-f0-9]+: c3 retq +[ ]*[a-f0-9]+: c3 ret * [a-f0-9]+ <_start>: [ ]*[a-f0-9]+: 48 c7 c0 f4 ff ff ff mov \$0xfffffffffffffff4,%rax @@ -24,5 +24,5 @@ Disassembly of section .text: [ ]*[a-f0-9]+: 03 18 add \(%rax\),%ebx [ ]*[a-f0-9]+: 89 d8 mov %ebx,%eax [ ]*[a-f0-9]+: 5b pop %rbx -[ ]*[a-f0-9]+: c3 retq +[ ]*[a-f0-9]+: c3 ret * #pass diff --git a/ld/testsuite/ld-x86-64/tlspie2c.d b/ld/testsuite/ld-x86-64/tlspie2c.d index 35627da..ed5e136 100644 --- a/ld/testsuite/ld-x86-64/tlspie2c.d +++ b/ld/testsuite/ld-x86-64/tlspie2c.d @@ -9,7 +9,7 @@ Disassembly of section .text: [a-f0-9]+ <__tls_get_addr>: -[ ]*[a-f0-9]+: c3 retq +[ ]*[a-f0-9]+: c3 ret * [a-f0-9]+ <_start>: [ ]*[a-f0-9]+: 48 c7 c0 f4 ff ff ff mov \$0xfffffffffffffff4,%rax @@ -24,5 +24,5 @@ Disassembly of section .text: [ ]*[a-f0-9]+: 03 18 add \(%rax\),%ebx [ ]*[a-f0-9]+: 89 d8 mov %ebx,%eax [ ]*[a-f0-9]+: 5b pop %rbx -[ ]*[a-f0-9]+: c3 retq +[ ]*[a-f0-9]+: c3 ret * #pass |