[binutils-gdb] x86: avoid attaching suffixes to unambiguous insns
Jan Beulich
jbeulich@sourceware.org
Wed Jul 15 06:56:08 GMT 2020
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=36938cabf0efcb053d1585e8580a4b3db438ca4e
commit 36938cabf0efcb053d1585e8580a4b3db438ca4e
Author: Jan Beulich <jbeulich@suse.com>
Date: Wed Jul 15 08:53:55 2020 +0200
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.
Diff:
---
gas/ChangeLog | 71 ++++++++++
gas/testsuite/gas/i386/disassem.d | 16 +--
gas/testsuite/gas/i386/ilp32/x86-64-branch.d | 60 ++++-----
gas/testsuite/gas/i386/intel.d | 2 +-
gas/testsuite/gas/i386/jump16.d | 4 +-
gas/testsuite/gas/i386/lfence-load.d | 2 +-
gas/testsuite/gas/i386/noreg16.d | 4 +-
gas/testsuite/gas/i386/noreg32.d | 4 +-
gas/testsuite/gas/i386/noreg64-rex64.d | 12 +-
gas/testsuite/gas/i386/noreg64.d | 12 +-
gas/testsuite/gas/i386/notrack.d | 22 ++--
gas/testsuite/gas/i386/opcode.d | 2 +-
gas/testsuite/gas/i386/solaris/x86-64-branch-2.d | 4 +-
gas/testsuite/gas/i386/solaris/x86-64-jump.d | 26 ++--
.../gas/i386/solaris/x86-64-mpx-branch-1.d | 20 +--
gas/testsuite/gas/i386/solaris/x86-64-nop-3.d | 2 +-
gas/testsuite/gas/i386/solaris/x86-64-nop-4.d | 2 +-
gas/testsuite/gas/i386/solaris/x86-64-nop-5.d | 2 +-
gas/testsuite/gas/i386/solaris/x86-64-relax-2.d | 22 ++--
gas/testsuite/gas/i386/solaris/x86-64-relax-3.d | 20 +--
gas/testsuite/gas/i386/x86-64-align-branch-1a.d | 2 +-
gas/testsuite/gas/i386/x86-64-align-branch-1b.d | 2 +-
gas/testsuite/gas/i386/x86-64-align-branch-1c.d | 2 +-
gas/testsuite/gas/i386/x86-64-align-branch-1d.d | 2 +-
gas/testsuite/gas/i386/x86-64-align-branch-1e.d | 2 +-
gas/testsuite/gas/i386/x86-64-align-branch-1f.d | 2 +-
gas/testsuite/gas/i386/x86-64-align-branch-1g.d | 2 +-
gas/testsuite/gas/i386/x86-64-align-branch-1h.d | 2 +-
gas/testsuite/gas/i386/x86-64-align-branch-1i.d | 2 +-
gas/testsuite/gas/i386/x86-64-align-branch-2a.d | 8 +-
gas/testsuite/gas/i386/x86-64-align-branch-2b.d | 8 +-
gas/testsuite/gas/i386/x86-64-align-branch-2c.d | 8 +-
gas/testsuite/gas/i386/x86-64-align-branch-3.d | 4 +-
gas/testsuite/gas/i386/x86-64-align-branch-4a.d | 4 +-
gas/testsuite/gas/i386/x86-64-align-branch-4b.d | 4 +-
gas/testsuite/gas/i386/x86-64-align-branch-5.d | 2 +-
gas/testsuite/gas/i386/x86-64-align-branch-6.d | 2 +-
gas/testsuite/gas/i386/x86-64-branch-2.d | 4 +-
gas/testsuite/gas/i386/x86-64-branch-3.d | 10 +-
gas/testsuite/gas/i386/x86-64-branch.d | 60 ++++-----
gas/testsuite/gas/i386/x86-64-disassem.d | 36 +++---
gas/testsuite/gas/i386/x86-64-disp32.d | 2 +-
gas/testsuite/gas/i386/x86-64-gotpcrel-no-relax.d | 17 +--
gas/testsuite/gas/i386/x86-64-gotpcrel.d | 17 +--
gas/testsuite/gas/i386/x86-64-ifunc.d | 6 +-
gas/testsuite/gas/i386/x86-64-jump.d | 26 ++--
gas/testsuite/gas/i386/x86-64-lfence-byte.d | 20 +--
gas/testsuite/gas/i386/x86-64-lfence-indbr-a.d | 12 +-
gas/testsuite/gas/i386/x86-64-lfence-indbr-b.d | 12 +-
gas/testsuite/gas/i386/x86-64-lfence-indbr-c.d | 12 +-
gas/testsuite/gas/i386/x86-64-lfence-load.d | 8 +-
gas/testsuite/gas/i386/x86-64-lfence-ret-a.d | 12 +-
gas/testsuite/gas/i386/x86-64-lfence-ret-b.d | 12 +-
gas/testsuite/gas/i386/x86-64-lfence-ret-c.d | 12 +-
gas/testsuite/gas/i386/x86-64-lfence-ret-d.d | 12 +-
gas/testsuite/gas/i386/x86-64-lfence-ret-e.d | 12 +-
gas/testsuite/gas/i386/x86-64-mpx-add-bnd-prefix.d | 18 +--
gas/testsuite/gas/i386/x86-64-mpx-branch-1.d | 20 +--
gas/testsuite/gas/i386/x86-64-mpx.d | 28 ++--
gas/testsuite/gas/i386/x86-64-nop-3.d | 2 +-
gas/testsuite/gas/i386/x86-64-nop-4.d | 2 +-
gas/testsuite/gas/i386/x86-64-nop-5.d | 2 +-
gas/testsuite/gas/i386/x86-64-nops-7.d | 4 +-
gas/testsuite/gas/i386/x86-64-notrack.d | 126 +++++++++---------
gas/testsuite/gas/i386/x86-64-opcode.d | 42 +++---
gas/testsuite/gas/i386/x86-64-relax-2.d | 22 ++--
gas/testsuite/gas/i386/x86-64-relax-3.d | 20 +--
gas/testsuite/gas/i386/x86-64-relax-4.d | 4 +-
gas/testsuite/gas/i386/x86-64-rtm.d | 8 +-
gas/testsuite/gas/i386/x86-64-stack.d | 64 ++++-----
gas/testsuite/gas/i386/x86-64-unique.d | 12 +-
gas/testsuite/gas/i386/x86_64-intel.d | 4 +-
ld/ChangeLog | 106 +++++++++++++++
ld/testsuite/ld-i386/ibt-plt-1.d | 2 +-
ld/testsuite/ld-i386/ibt-plt-2a.d | 2 +-
ld/testsuite/ld-i386/ibt-plt-2c.d | 2 +-
ld/testsuite/ld-i386/ibt-plt-3a.d | 2 +-
ld/testsuite/ld-i386/ibt-plt-3c.d | 2 +-
ld/testsuite/ld-i386/plt-pic.pd | 2 +-
ld/testsuite/ld-i386/plt-pic2.dd | 2 +-
ld/testsuite/ld-i386/plt.pd | 2 +-
ld/testsuite/ld-i386/plt2.dd | 2 +-
ld/testsuite/ld-i386/pr19636-1d.d | 2 +-
ld/testsuite/ld-i386/pr19636-1l.d | 2 +-
ld/testsuite/ld-i386/pr19636-2c.d | 2 +-
ld/testsuite/ld-i386/pr20830.d | 2 +-
ld/testsuite/ld-i386/vxworks1-lib.dd | 2 +-
ld/testsuite/ld-i386/vxworks1.dd | 2 +-
ld/testsuite/ld-ifunc/ifunc-2-i386-now.d | 2 +-
ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d | 2 +-
ld/testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d | 16 +--
ld/testsuite/ld-ifunc/ifunc-2-x86-64-now.d | 16 +--
ld/testsuite/ld-ifunc/ifunc-21-x86-64.d | 8 +-
ld/testsuite/ld-ifunc/ifunc-22-x86-64.d | 8 +-
ld/testsuite/ld-ifunc/pr17154-i386-now.d | 2 +-
ld/testsuite/ld-ifunc/pr17154-i386.d | 2 +-
ld/testsuite/ld-ifunc/pr17154-x86-64-now.d | 36 +++---
ld/testsuite/ld-ifunc/pr17154-x86-64.d | 36 +++---
ld/testsuite/ld-x86-64/align-branch-1.d | 2 +-
ld/testsuite/ld-x86-64/bnd-branch-1-now.d | 40 +++---
ld/testsuite/ld-x86-64/bnd-branch-1.d | 12 +-
ld/testsuite/ld-x86-64/bnd-ifunc-1-now.d | 16 +--
ld/testsuite/ld-x86-64/bnd-ifunc-1.d | 2 +-
ld/testsuite/ld-x86-64/bnd-ifunc-2-now.d | 36 +++---
ld/testsuite/ld-x86-64/bnd-ifunc-2.d | 36 +++---
ld/testsuite/ld-x86-64/bnd-plt-1-now.d | 40 +++---
ld/testsuite/ld-x86-64/bnd-plt-1.d | 40 +++---
ld/testsuite/ld-x86-64/call1a.d | 2 +-
ld/testsuite/ld-x86-64/call1b.d | 2 +-
ld/testsuite/ld-x86-64/call1d.d | 2 +-
ld/testsuite/ld-x86-64/call1e.d | 2 +-
ld/testsuite/ld-x86-64/call1f.d | 2 +-
ld/testsuite/ld-x86-64/call1g.d | 2 +-
ld/testsuite/ld-x86-64/call1h.d | 2 +-
ld/testsuite/ld-x86-64/call1i.d | 2 +-
ld/testsuite/ld-x86-64/gotpcrel1.dd | 14 +-
ld/testsuite/ld-x86-64/hidden2.d | 4 +-
ld/testsuite/ld-x86-64/ibt-plt-1-x32.d | 20 +--
ld/testsuite/ld-x86-64/ibt-plt-1.d | 20 +--
ld/testsuite/ld-x86-64/ibt-plt-2a-x32.d | 20 +--
ld/testsuite/ld-x86-64/ibt-plt-2a.d | 20 +--
ld/testsuite/ld-x86-64/ibt-plt-2c-x32.d | 20 +--
ld/testsuite/ld-x86-64/ibt-plt-2c.d | 20 +--
ld/testsuite/ld-x86-64/ibt-plt-3a-x32.d | 20 +--
ld/testsuite/ld-x86-64/ibt-plt-3a.d | 20 +--
ld/testsuite/ld-x86-64/ibt-plt-3c-x32.d | 20 +--
ld/testsuite/ld-x86-64/ibt-plt-3c.d | 20 +--
ld/testsuite/ld-x86-64/libno-plt-1b.dd | 4 +-
ld/testsuite/ld-x86-64/mpx3.dd | 16 +--
ld/testsuite/ld-x86-64/mpx3n.dd | 16 +--
ld/testsuite/ld-x86-64/mpx4.dd | 12 +-
ld/testsuite/ld-x86-64/mpx4n.dd | 12 +-
ld/testsuite/ld-x86-64/no-plt-1a.dd | 14 +-
ld/testsuite/ld-x86-64/no-plt-1b.dd | 10 +-
ld/testsuite/ld-x86-64/no-plt-1c.dd | 10 +-
ld/testsuite/ld-x86-64/no-plt-1d.dd | 14 +-
ld/testsuite/ld-x86-64/no-plt-1e.dd | 14 +-
ld/testsuite/ld-x86-64/no-plt-1f.dd | 10 +-
ld/testsuite/ld-x86-64/no-plt-1g.dd | 10 +-
ld/testsuite/ld-x86-64/plt-main-bnd.dd | 2 +-
ld/testsuite/ld-x86-64/plt-main-ibt-x32.dd | 2 +-
ld/testsuite/ld-x86-64/plt-main-ibt.dd | 2 +-
ld/testsuite/ld-x86-64/plt.pd | 16 +--
ld/testsuite/ld-x86-64/plt2.dd | 20 +--
ld/testsuite/ld-x86-64/pr19609-5a.d | 2 +-
ld/testsuite/ld-x86-64/pr19609-5b.d | 2 +-
ld/testsuite/ld-x86-64/pr19609-5c.d | 2 +-
ld/testsuite/ld-x86-64/pr19609-5e.d | 2 +-
ld/testsuite/ld-x86-64/pr19609-7b.d | 2 +-
ld/testsuite/ld-x86-64/pr19609-7d.d | 2 +-
ld/testsuite/ld-x86-64/pr19636-2d.d | 14 +-
ld/testsuite/ld-x86-64/pr19636-2l.d | 14 +-
ld/testsuite/ld-x86-64/pr20253-1b.d | 8 +-
ld/testsuite/ld-x86-64/pr20253-1d.d | 8 +-
ld/testsuite/ld-x86-64/pr20253-1f.d | 8 +-
ld/testsuite/ld-x86-64/pr20253-1h.d | 8 +-
ld/testsuite/ld-x86-64/pr20253-1j.d | 8 +-
ld/testsuite/ld-x86-64/pr20253-1l.d | 8 +-
ld/testsuite/ld-x86-64/pr20830a-now.d | 8 +-
ld/testsuite/ld-x86-64/pr20830a.d | 8 +-
ld/testsuite/ld-x86-64/pr20830b-now.d | 8 +-
ld/testsuite/ld-x86-64/pr20830b.d | 8 +-
ld/testsuite/ld-x86-64/pr21038a-now.d | 8 +-
ld/testsuite/ld-x86-64/pr21038a.d | 8 +-
ld/testsuite/ld-x86-64/pr21038b-now.d | 12 +-
ld/testsuite/ld-x86-64/pr21038b.d | 12 +-
ld/testsuite/ld-x86-64/pr21038c-now.d | 16 +--
ld/testsuite/ld-x86-64/pr21038c.d | 16 +--
ld/testsuite/ld-x86-64/pr23930-x32.d | 2 +-
ld/testsuite/ld-x86-64/pr23930.d | 2 +-
ld/testsuite/ld-x86-64/pr25416-1a.d | 2 +-
ld/testsuite/ld-x86-64/pr25416-2a.d | 2 +-
ld/testsuite/ld-x86-64/pr26018.d | 4 +-
ld/testsuite/ld-x86-64/protected2-k1om.d | 6 +-
ld/testsuite/ld-x86-64/protected2-l1om.d | 6 +-
ld/testsuite/ld-x86-64/protected2.d | 6 +-
ld/testsuite/ld-x86-64/protected3.d | 2 +-
ld/testsuite/ld-x86-64/protected8.d | 2 +-
ld/testsuite/ld-x86-64/tlsbin.dd | 8 +-
ld/testsuite/ld-x86-64/tlsbin2.dd | 8 +-
ld/testsuite/ld-x86-64/tlsbindesc.dd | 8 +-
ld/testsuite/ld-x86-64/tlsdesc.dd | 14 +-
ld/testsuite/ld-x86-64/tlsdesc.pd | 8 +-
ld/testsuite/ld-x86-64/tlsgd10.dd | 2 +-
ld/testsuite/ld-x86-64/tlsgd7.dd | 2 +-
ld/testsuite/ld-x86-64/tlsgd8.dd | 2 +-
ld/testsuite/ld-x86-64/tlsgd9.dd | 2 +-
ld/testsuite/ld-x86-64/tlsgdesc.dd | 12 +-
ld/testsuite/ld-x86-64/tlsld3.dd | 2 +-
ld/testsuite/ld-x86-64/tlsld4.dd | 2 +-
ld/testsuite/ld-x86-64/tlspic.dd | 32 ++---
ld/testsuite/ld-x86-64/tlspic2.dd | 32 ++---
ld/testsuite/ld-x86-64/tlspie2b.d | 4 +-
ld/testsuite/ld-x86-64/tlspie2c.d | 4 +-
opcodes/ChangeLog | 14 ++
opcodes/i386-dis.c | 143 +++++++--------------
196 files changed, 1308 insertions(+), 1170 deletions(-)
diff --git a/gas/ChangeLog b/gas/ChangeLog
index b841a4c0efc..e710045cfe1 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,74 @@
+2020-07-15 Jan Beulich <jbeulich@suse.com>
+
+ * testsuite/gas/i386/disassem.d,
+ testsuite/gas/i386/ilp32/x86-64-branch.d,
+ testsuite/gas/i386/intel.d, testsuite/gas/i386/jump16.d,
+ testsuite/gas/i386/lfence-load.d, testsuite/gas/i386/noreg16.d,
+ testsuite/gas/i386/noreg32.d,
+ testsuite/gas/i386/noreg64-rex64.d,
+ testsuite/gas/i386/noreg64.d, testsuite/gas/i386/notrack.d,
+ testsuite/gas/i386/opcode.d,
+ testsuite/gas/i386/solaris/x86-64-branch-2.d,
+ testsuite/gas/i386/solaris/x86-64-jump.d,
+ testsuite/gas/i386/solaris/x86-64-mpx-branch-1.d,
+ testsuite/gas/i386/solaris/x86-64-nop-3.d,
+ testsuite/gas/i386/solaris/x86-64-nop-4.d,
+ testsuite/gas/i386/solaris/x86-64-nop-5.d,
+ testsuite/gas/i386/solaris/x86-64-relax-2.d,
+ testsuite/gas/i386/solaris/x86-64-relax-3.d,
+ testsuite/gas/i386/x86-64-align-branch-1a.d,
+ testsuite/gas/i386/x86-64-align-branch-1b.d,
+ testsuite/gas/i386/x86-64-align-branch-1c.d,
+ testsuite/gas/i386/x86-64-align-branch-1d.d,
+ testsuite/gas/i386/x86-64-align-branch-1e.d,
+ testsuite/gas/i386/x86-64-align-branch-1f.d,
+ testsuite/gas/i386/x86-64-align-branch-1g.d,
+ testsuite/gas/i386/x86-64-align-branch-1h.d,
+ testsuite/gas/i386/x86-64-align-branch-1i.d,
+ testsuite/gas/i386/x86-64-align-branch-2a.d,
+ testsuite/gas/i386/x86-64-align-branch-2b.d,
+ testsuite/gas/i386/x86-64-align-branch-2c.d,
+ testsuite/gas/i386/x86-64-align-branch-3.d,
+ testsuite/gas/i386/x86-64-align-branch-4a.d,
+ testsuite/gas/i386/x86-64-align-branch-4b.d,
+ testsuite/gas/i386/x86-64-align-branch-5.d,
+ testsuite/gas/i386/x86-64-align-branch-6.d,
+ testsuite/gas/i386/x86-64-branch-2.d,
+ testsuite/gas/i386/x86-64-branch-3.d,
+ testsuite/gas/i386/x86-64-branch.d,
+ testsuite/gas/i386/x86-64-disassem.d,
+ testsuite/gas/i386/x86-64-disp32.d,
+ testsuite/gas/i386/x86-64-gotpcrel-no-relax.d,
+ testsuite/gas/i386/x86-64-gotpcrel.d,
+ testsuite/gas/i386/x86-64-ifunc.d,
+ testsuite/gas/i386/x86-64-jump.d,
+ testsuite/gas/i386/x86-64-lfence-byte.d,
+ testsuite/gas/i386/x86-64-lfence-indbr-a.d,
+ testsuite/gas/i386/x86-64-lfence-indbr-b.d,
+ testsuite/gas/i386/x86-64-lfence-indbr-c.d,
+ testsuite/gas/i386/x86-64-lfence-load.d,
+ testsuite/gas/i386/x86-64-lfence-ret-a.d,
+ testsuite/gas/i386/x86-64-lfence-ret-b.d,
+ testsuite/gas/i386/x86-64-lfence-ret-c.d,
+ testsuite/gas/i386/x86-64-lfence-ret-d.d,
+ testsuite/gas/i386/x86-64-lfence-ret-e.d,
+ testsuite/gas/i386/x86-64-mpx-add-bnd-prefix.d,
+ testsuite/gas/i386/x86-64-mpx-branch-1.d,
+ testsuite/gas/i386/x86-64-mpx.d,
+ testsuite/gas/i386/x86-64-nop-3.d,
+ testsuite/gas/i386/x86-64-nop-4.d,
+ testsuite/gas/i386/x86-64-nop-5.d,
+ testsuite/gas/i386/x86-64-nops-7.d,
+ testsuite/gas/i386/x86-64-notrack.d,
+ testsuite/gas/i386/x86-64-opcode.d,
+ testsuite/gas/i386/x86-64-relax-2.d,
+ testsuite/gas/i386/x86-64-relax-3.d,
+ testsuite/gas/i386/x86-64-relax-4.d,
+ testsuite/gas/i386/x86-64-rtm.d,
+ testsuite/gas/i386/x86-64-stack.d,
+ testsuite/gas/i386/x86-64-unique.d,
+ testsuite/gas/i386/x86_64-intel.d: Adjust expectations.
+
2020-07-14 H.J. Lu <hongjiu.lu@intel.com>
PR gas/26237
diff --git a/gas/testsuite/gas/i386/disassem.d b/gas/testsuite/gas/i386/disassem.d
index 9a805a49075..be821ad49d1 100644
--- a/gas/testsuite/gas/i386/disassem.d
+++ b/gas/testsuite/gas/i386/disassem.d
@@ -246,49 +246,49 @@ Disassembly of section \.text:
[ ]*[a-f0-9]+:[ ]*c4 e1 f9 99[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*3f[ ]*aas[ ]*
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 30[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*8f 01[ ]*popl \(%ecx\)
+[ ]*[a-f0-9]+:[ ]*8f 01[ ]*pop \(%ecx\)
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 30[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*6a 01[ ]*push \$0x1
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 30[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*04 01[ ]*add \$0x1,%al
[ ]*[a-f0-9]+:[ ]*c4 e3 79 30[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*8f 01[ ]*popl \(%ecx\)
+[ ]*[a-f0-9]+:[ ]*8f 01[ ]*pop \(%ecx\)
[ ]*[a-f0-9]+:[ ]*c4 e3 79 30[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*6a 01[ ]*push \$0x1
[ ]*[a-f0-9]+:[ ]*c4 e3 79 30[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*04 01[ ]*add \$0x1,%al
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 31[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*8f 01[ ]*popl \(%ecx\)
+[ ]*[a-f0-9]+:[ ]*8f 01[ ]*pop \(%ecx\)
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 31[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*6a 01[ ]*push \$0x1
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 31[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*04 01[ ]*add \$0x1,%al
[ ]*[a-f0-9]+:[ ]*c4 e3 79 31[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*8f 01[ ]*popl \(%ecx\)
+[ ]*[a-f0-9]+:[ ]*8f 01[ ]*pop \(%ecx\)
[ ]*[a-f0-9]+:[ ]*c4 e3 79 31[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*6a 01[ ]*push \$0x1
[ ]*[a-f0-9]+:[ ]*c4 e3 79 31[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*04 01[ ]*add \$0x1,%al
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 32[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*8f 01[ ]*popl \(%ecx\)
+[ ]*[a-f0-9]+:[ ]*8f 01[ ]*pop \(%ecx\)
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 32[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*6a 01[ ]*push \$0x1
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 32[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*04 01[ ]*add \$0x1,%al
[ ]*[a-f0-9]+:[ ]*c4 e3 79 32[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*8f 01[ ]*popl \(%ecx\)
+[ ]*[a-f0-9]+:[ ]*8f 01[ ]*pop \(%ecx\)
[ ]*[a-f0-9]+:[ ]*c4 e3 79 32[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*6a 01[ ]*push \$0x1
[ ]*[a-f0-9]+:[ ]*c4 e3 79 32[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*04 01[ ]*add \$0x1,%al
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 33[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*8f 01[ ]*popl \(%ecx\)
+[ ]*[a-f0-9]+:[ ]*8f 01[ ]*pop \(%ecx\)
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 33[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*6a 01[ ]*push \$0x1
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 33[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*04 01[ ]*add \$0x1,%al
[ ]*[a-f0-9]+:[ ]*c4 e3 79 33[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*8f 01[ ]*popl \(%ecx\)
+[ ]*[a-f0-9]+:[ ]*8f 01[ ]*pop \(%ecx\)
[ ]*[a-f0-9]+:[ ]*c4 e3 79 33[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*6a 01[ ]*push \$0x1
[ ]*[a-f0-9]+:[ ]*c4 e3 79 33[ ]*\(bad\)[ ]*
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-branch.d b/gas/testsuite/gas/i386/ilp32/x86-64-branch.d
index 5bfa2a464cb..8be91de922f 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-branch.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-branch.d
@@ -8,35 +8,35 @@
Disassembly of section .text:
0+ <.text>:
-[ ]*[a-f0-9]+: ff d0 callq \*%rax
-[ ]*[a-f0-9]+: ff d0 callq \*%rax
-[ ]*[a-f0-9]+: 66 ff d0 data16 callq \*%rax
-[ ]*[a-f0-9]+: 66 ff d0 data16 callq \*%rax
-[ ]*[a-f0-9]+: 66 ff 10 data16 callq \*\(%rax\)
-[ ]*[a-f0-9]+: ff e0 jmpq \*%rax
-[ ]*[a-f0-9]+: ff e0 jmpq \*%rax
-[ ]*[a-f0-9]+: 66 ff e0 data16 jmpq \*%rax
-[ ]*[a-f0-9]+: 66 ff e0 data16 jmpq \*%rax
-[ ]*[a-f0-9]+: 66 ff 20 data16 jmpq \*\(%rax\)
-[ ]*[a-f0-9]+: e8 00 00 00 00 callq 0x1f 1b: R_X86_64_PC32 \*ABS\*\+0x10003c
-[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq 0x24 20: R_X86_64_PC32 \*ABS\*\+0x10003c
-[ ]*[a-f0-9]+: 66 e8 00 00 00 00 data16 callq 0x2a 26: R_X86_64_PLT32 foo-0x4
-[ ]*[a-f0-9]+: 66 e9 00 00 00 00 data16 jmpq 0x30 2c: R_X86_64_PLT32 foo-0x4
+[ ]*[a-f0-9]+: ff d0 call \*%rax
+[ ]*[a-f0-9]+: ff d0 call \*%rax
+[ ]*[a-f0-9]+: 66 ff d0 data16 call \*%rax
+[ ]*[a-f0-9]+: 66 ff d0 data16 call \*%rax
+[ ]*[a-f0-9]+: 66 ff 10 data16 call \*\(%rax\)
+[ ]*[a-f0-9]+: ff e0 jmp \*%rax
+[ ]*[a-f0-9]+: ff e0 jmp \*%rax
+[ ]*[a-f0-9]+: 66 ff e0 data16 jmp \*%rax
+[ ]*[a-f0-9]+: 66 ff e0 data16 jmp \*%rax
+[ ]*[a-f0-9]+: 66 ff 20 data16 jmp \*\(%rax\)
+[ ]*[a-f0-9]+: e8 00 00 00 00 call 0x1f 1b: R_X86_64_PC32 \*ABS\*\+0x10003c
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 0x24 20: R_X86_64_PC32 \*ABS\*\+0x10003c
+[ ]*[a-f0-9]+: 66 e8 00 00 00 00 data16 call 0x2a 26: R_X86_64_PLT32 foo-0x4
+[ ]*[a-f0-9]+: 66 e9 00 00 00 00 data16 jmp 0x30 2c: R_X86_64_PLT32 foo-0x4
[ ]*[a-f0-9]+: 66 0f 82 00 00 00 00 data16 jb 0x37 33: R_X86_64_PLT32 foo-0x4
-[ ]*[a-f0-9]+: 66 c3 data16 retq *
-[ ]*[a-f0-9]+: 66 c2 08 00 data16 retq \$0x8
-[ ]*[a-f0-9]+: ff d0 callq \*%rax
-[ ]*[a-f0-9]+: ff d0 callq \*%rax
-[ ]*[a-f0-9]+: 66 ff d0 data16 callq \*%rax
-[ ]*[a-f0-9]+: 66 ff d0 data16 callq \*%rax
-[ ]*[a-f0-9]+: 66 ff 10 data16 callq \*\(%rax\)
-[ ]*[a-f0-9]+: ff e0 jmpq \*%rax
-[ ]*[a-f0-9]+: ff e0 jmpq \*%rax
-[ ]*[a-f0-9]+: 66 ff e0 data16 jmpq \*%rax
-[ ]*[a-f0-9]+: 66 ff e0 data16 jmpq \*%rax
-[ ]*[a-f0-9]+: 66 ff 20 data16 jmpq \*\(%rax\)
-[ ]*[a-f0-9]+: e8 00 00 00 00 callq 0x[0-9a-f]* [0-9a-f]*: R_X86_64_PC32 \*ABS\*\+0x10003c
-[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq 0x[0-9a-f]* [0-9a-f]*: R_X86_64_PC32 \*ABS\*\+0x10003c
-[ ]*[a-f0-9]+: 66 c3 data16 retq *
-[ ]*[a-f0-9]+: 66 c2 08 00 data16 retq \$0x8
+[ ]*[a-f0-9]+: 66 c3 data16 ret *
+[ ]*[a-f0-9]+: 66 c2 08 00 data16 ret \$0x8
+[ ]*[a-f0-9]+: ff d0 call \*%rax
+[ ]*[a-f0-9]+: ff d0 call \*%rax
+[ ]*[a-f0-9]+: 66 ff d0 data16 call \*%rax
+[ ]*[a-f0-9]+: 66 ff d0 data16 call \*%rax
+[ ]*[a-f0-9]+: 66 ff 10 data16 call \*\(%rax\)
+[ ]*[a-f0-9]+: ff e0 jmp \*%rax
+[ ]*[a-f0-9]+: ff e0 jmp \*%rax
+[ ]*[a-f0-9]+: 66 ff e0 data16 jmp \*%rax
+[ ]*[a-f0-9]+: 66 ff e0 data16 jmp \*%rax
+[ ]*[a-f0-9]+: 66 ff 20 data16 jmp \*\(%rax\)
+[ ]*[a-f0-9]+: e8 00 00 00 00 call 0x[0-9a-f]* [0-9a-f]*: R_X86_64_PC32 \*ABS\*\+0x10003c
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 0x[0-9a-f]* [0-9a-f]*: R_X86_64_PC32 \*ABS\*\+0x10003c
+[ ]*[a-f0-9]+: 66 c3 data16 ret *
+[ ]*[a-f0-9]+: 66 c2 08 00 data16 ret \$0x8
#pass
diff --git a/gas/testsuite/gas/i386/intel.d b/gas/testsuite/gas/i386/intel.d
index c2c055121c4..fe71dcf0e1b 100644
--- a/gas/testsuite/gas/i386/intel.d
+++ b/gas/testsuite/gas/i386/intel.d
@@ -141,7 +141,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 8c 90 90 90 90 90 [ ]*mov %ss,-0x6f6f6f70\(%eax\)
[ ]*[a-f0-9]+: 8d 90 90 90 90 90 [ ]*lea -0x6f6f6f70\(%eax\),%edx
[ ]*[a-f0-9]+: 8e 90 90 90 90 90 [ ]*mov -0x6f6f6f70\(%eax\),%ss
-[ ]*[a-f0-9]+: 8f 80 90 90 90 90 [ ]*popl -0x6f6f6f70\(%eax\)
+[ ]*[a-f0-9]+: 8f 80 90 90 90 90 [ ]*pop -0x6f6f6f70\(%eax\)
[ ]*[a-f0-9]+: 90 [ ]*nop
[ ]*[a-f0-9]+: 91 [ ]*xchg %eax,%ecx
[ ]*[a-f0-9]+: 92 [ ]*xchg %eax,%edx
diff --git a/gas/testsuite/gas/i386/jump16.d b/gas/testsuite/gas/i386/jump16.d
index c883eba0e85..afb1c377e73 100644
--- a/gas/testsuite/gas/i386/jump16.d
+++ b/gas/testsuite/gas/i386/jump16.d
@@ -10,7 +10,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: eb fe jmp (0x0|0 <.text>)
[ ]*[a-f0-9]+: e9 f(e|b) ff jmp (0x3|0 <.text>) 3: (R_386_PC)?(DISP)?16 xxx
[ ]*[a-f0-9]+: ff 26 00 00 jmp \*0x0 7: (R_386_)?16 xxx
-[ ]*[a-f0-9]+: 66 ff e7 jmpl \*%edi
+[ ]*[a-f0-9]+: 66 ff e7 jmp \*%edi
[ ]*[a-f0-9]+: 67 ff 27 jmp \*\(%edi\)
[ ]*[a-f0-9]+: 67 ff af 00 00 00 00 ljmp \*0x0\(%edi\) 12: (R_386_)?(dir)?32 xxx
[ ]*[a-f0-9]+: ff 2e 00 00 ljmp \*0x0 18: (R_386_)?16 xxx
@@ -18,7 +18,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 66 e8 db ff ff ff calll (0x0|0 <.text>)
[ ]*[a-f0-9]+: 66 e8 (fc|d5) ff ff ff calll (0x27|0 <.text>) 27: (R_386_PC)?(DISP)?32 xxx
[ ]*[a-f0-9]+: 66 ff 16 00 00 calll \*0x0 2e: (R_386_)?16 xxx
-[ ]*[a-f0-9]+: 66 ff d7 calll \*%edi
+[ ]*[a-f0-9]+: 66 ff d7 call \*%edi
[ ]*[a-f0-9]+: 67 66 ff 17 calll \*\(%edi\)
[ ]*[a-f0-9]+: 67 66 ff 9f 00 00 00 00 lcalll \*0x0\(%edi\) 3b: (R_386_)?(dir)?32 xxx
[ ]*[a-f0-9]+: 66 ff 1e 00 00 lcalll \*0x0 42: (R_386_)?16 xxx
diff --git a/gas/testsuite/gas/i386/lfence-load.d b/gas/testsuite/gas/i386/lfence-load.d
index 0d355df5561..04d7f9a7003 100644
--- a/gas/testsuite/gas/i386/lfence-load.d
+++ b/gas/testsuite/gas/i386/lfence-load.d
@@ -79,7 +79,7 @@ Disassembly of section .text:
+[a-f0-9]+: 0f ae e8 lfence
+[a-f0-9]+: 0f 0f 66 02 b0 pfcmpeq 0x2\(%esi\),%mm4
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 8f 00 popl \(%eax\)
+ +[a-f0-9]+: 8f 00 pop \(%eax\)
+[a-f0-9]+: 0f ae e8 lfence
+[a-f0-9]+: 58 pop %eax
+[a-f0-9]+: 0f ae e8 lfence
diff --git a/gas/testsuite/gas/i386/noreg16.d b/gas/testsuite/gas/i386/noreg16.d
index 655b809dfd5..e05fdc7b15f 100644
--- a/gas/testsuite/gas/i386/noreg16.d
+++ b/gas/testsuite/gas/i386/noreg16.d
@@ -90,10 +90,10 @@ Disassembly of section .text:
*[a-f0-9]+: ef out %ax,\(%dx\)
*[a-f0-9]+: 6f outsw %ds:\(%si\),\(%dx\)
*[a-f0-9]+: 6f outsw %ds:\(%si\),\(%dx\)
- *[a-f0-9]+: 8f 07 popw \(%bx\)
+ *[a-f0-9]+: 8f 07 pop \(%bx\)
*[a-f0-9]+: 07 pop %es
*[a-f0-9]+: f3 0f ae 27 ptwrite \(%bx\)
- *[a-f0-9]+: ff 37 pushw \(%bx\)
+ *[a-f0-9]+: ff 37 push \(%bx\)
*[a-f0-9]+: 06 push %es
*[a-f0-9]+: d1 17 rclw \(%bx\)
*[a-f0-9]+: c1 17 02 rclw \$0x2,\(%bx\)
diff --git a/gas/testsuite/gas/i386/noreg32.d b/gas/testsuite/gas/i386/noreg32.d
index 5de78e892ae..e0505147a2c 100644
--- a/gas/testsuite/gas/i386/noreg32.d
+++ b/gas/testsuite/gas/i386/noreg32.d
@@ -96,10 +96,10 @@ Disassembly of section .text:
*[a-f0-9]+: ef out %eax,\(%dx\)
*[a-f0-9]+: 6f outsl %ds:\(%esi\),\(%dx\)
*[a-f0-9]+: 6f outsl %ds:\(%esi\),\(%dx\)
- *[a-f0-9]+: 8f 00 popl \(%eax\)
+ *[a-f0-9]+: 8f 00 pop \(%eax\)
*[a-f0-9]+: 07 pop %es
*[a-f0-9]+: f3 0f ae 20 ptwrite \(%eax\)
- *[a-f0-9]+: ff 30 pushl \(%eax\)
+ *[a-f0-9]+: ff 30 push \(%eax\)
*[a-f0-9]+: 06 push %es
*[a-f0-9]+: d1 10 rcll \(%eax\)
*[a-f0-9]+: c1 10 02 rcll \$0x2,\(%eax\)
diff --git a/gas/testsuite/gas/i386/noreg64-rex64.d b/gas/testsuite/gas/i386/noreg64-rex64.d
index 080f0904ba5..db36de483c5 100644
--- a/gas/testsuite/gas/i386/noreg64-rex64.d
+++ b/gas/testsuite/gas/i386/noreg64-rex64.d
@@ -24,7 +24,7 @@ Disassembly of section .text:
*[a-f0-9]+: 48 0f ba 38 01 btcq \$0x1,\(%rax\)
*[a-f0-9]+: 48 0f ba 30 01 btrq \$0x1,\(%rax\)
*[a-f0-9]+: 48 0f ba 28 01 btsq \$0x1,\(%rax\)
- *[a-f0-9]+: 48 ff 10 rex\.W callq \*\(%rax\)
+ *[a-f0-9]+: 48 ff 10 rex\.W call \*\(%rax\)
*[a-f0-9]+: 48 83 38 01 cmpq \$0x1,\(%rax\)
*[a-f0-9]+: 48 81 38 89 00 00 00 cmpq \$0x89,\(%rax\)
*[a-f0-9]+: 48 81 38 34 12 00 00 cmpq \$0x1234,\(%rax\)
@@ -65,7 +65,7 @@ Disassembly of section .text:
*[a-f0-9]+: 48 6d rex\.W insl \(%dx\),%es:\(%rdi\)
*[a-f0-9]+: 48 6d rex\.W insl \(%dx\),%es:\(%rdi\)
*[a-f0-9]+: 48 cf iretq *
- *[a-f0-9]+: 48 ff 20 rex\.W jmpq \*\(%rax\)
+ *[a-f0-9]+: 48 ff 20 rex\.W jmp \*\(%rax\)
*[a-f0-9]+: 48 ff 18 rex\.W lcall \*\(%rax\)
*[a-f0-9]+: 48 0f 01 10 rex\.W lgdt \(%rax\)
*[a-f0-9]+: 48 0f 01 18 rex\.W lidt \(%rax\)
@@ -100,11 +100,11 @@ Disassembly of section .text:
*[a-f0-9]+: 48 ef rex\.W out %eax,\(%dx\)
*[a-f0-9]+: 48 6f rex\.W outsl %ds:\(%rsi\),\(%dx\)
*[a-f0-9]+: 48 6f rex\.W outsl %ds:\(%rsi\),\(%dx\)
- *[a-f0-9]+: 48 8f 00 rex\.W popq \(%rax\)
- *[a-f0-9]+: 48 0f a1 rex\.W popq %fs
+ *[a-f0-9]+: 48 8f 00 rex\.W pop \(%rax\)
+ *[a-f0-9]+: 48 0f a1 rex\.W pop %fs
*[a-f0-9]+: f3 48 0f ae 20 ptwriteq \(%rax\)
- *[a-f0-9]+: 48 ff 30 rex\.W pushq \(%rax\)
- *[a-f0-9]+: 48 0f a0 rex\.W pushq %fs
+ *[a-f0-9]+: 48 ff 30 rex\.W push \(%rax\)
+ *[a-f0-9]+: 48 0f a0 rex\.W push %fs
*[a-f0-9]+: 48 d1 10 rclq \(%rax\)
*[a-f0-9]+: 48 c1 10 02 rclq \$0x2,\(%rax\)
*[a-f0-9]+: 48 d3 10 rclq %cl,\(%rax\)
diff --git a/gas/testsuite/gas/i386/noreg64.d b/gas/testsuite/gas/i386/noreg64.d
index fd1193d8360..33457049df4 100644
--- a/gas/testsuite/gas/i386/noreg64.d
+++ b/gas/testsuite/gas/i386/noreg64.d
@@ -23,7 +23,7 @@ Disassembly of section .text:
*[a-f0-9]+: 0f ba 38 01 btcl \$0x1,\(%rax\)
*[a-f0-9]+: 0f ba 30 01 btrl \$0x1,\(%rax\)
*[a-f0-9]+: 0f ba 28 01 btsl \$0x1,\(%rax\)
- *[a-f0-9]+: ff 10 callq \*\(%rax\)
+ *[a-f0-9]+: ff 10 call \*\(%rax\)
*[a-f0-9]+: 83 38 01 cmpl \$0x1,\(%rax\)
*[a-f0-9]+: 81 38 89 00 00 00 cmpl \$0x89,\(%rax\)
*[a-f0-9]+: 81 38 34 12 00 00 cmpl \$0x1234,\(%rax\)
@@ -65,7 +65,7 @@ Disassembly of section .text:
*[a-f0-9]+: 6d insl \(%dx\),%es:\(%rdi\)
*[a-f0-9]+: 6d insl \(%dx\),%es:\(%rdi\)
*[a-f0-9]+: cf iret *
- *[a-f0-9]+: ff 20 jmpq \*\(%rax\)
+ *[a-f0-9]+: ff 20 jmp \*\(%rax\)
*[a-f0-9]+: ff 18 lcall \*\(%rax\)
*[a-f0-9]+: 0f 01 10 lgdt \(%rax\)
*[a-f0-9]+: 0f 01 18 lidt \(%rax\)
@@ -102,11 +102,11 @@ Disassembly of section .text:
*[a-f0-9]+: ef out %eax,\(%dx\)
*[a-f0-9]+: 6f outsl %ds:\(%rsi\),\(%dx\)
*[a-f0-9]+: 6f outsl %ds:\(%rsi\),\(%dx\)
- *[a-f0-9]+: 8f 00 popq \(%rax\)
- *[a-f0-9]+: 0f a1 popq %fs
+ *[a-f0-9]+: 8f 00 pop \(%rax\)
+ *[a-f0-9]+: 0f a1 pop %fs
*[a-f0-9]+: f3 0f ae 20 ptwritel \(%rax\)
- *[a-f0-9]+: ff 30 pushq \(%rax\)
- *[a-f0-9]+: 0f a0 pushq %fs
+ *[a-f0-9]+: ff 30 push \(%rax\)
+ *[a-f0-9]+: 0f a0 push %fs
*[a-f0-9]+: d1 10 rcll \(%rax\)
*[a-f0-9]+: c1 10 02 rcll \$0x2,\(%rax\)
*[a-f0-9]+: d3 10 rcll %cl,\(%rax\)
diff --git a/gas/testsuite/gas/i386/notrack.d b/gas/testsuite/gas/i386/notrack.d
index 44fd11036e2..1208c922e6b 100644
--- a/gas/testsuite/gas/i386/notrack.d
+++ b/gas/testsuite/gas/i386/notrack.d
@@ -8,45 +8,45 @@ Disassembly of section .text:
0+ <_start>:
[ ]*[a-f0-9]+: 3e ff d0 notrack call \*%eax
-[ ]*[a-f0-9]+: 3e 66 ff d0 notrack callw \*%ax
+[ ]*[a-f0-9]+: 3e 66 ff d0 notrack call \*%ax
[ ]*[a-f0-9]+: 3e ff e0 notrack jmp \*%eax
-[ ]*[a-f0-9]+: 3e 66 ff e0 notrack jmpw \*%ax
+[ ]*[a-f0-9]+: 3e 66 ff e0 notrack jmp \*%ax
[ ]*[a-f0-9]+: 3e ff 10 notrack call \*\(%eax\)
[ ]*[a-f0-9]+: 3e 66 ff 10 notrack callw \*\(%eax\)
[ ]*[a-f0-9]+: 3e ff 20 notrack jmp \*\(%eax\)
[ ]*[a-f0-9]+: 3e 66 ff 20 notrack jmpw \*\(%eax\)
[ ]*[a-f0-9]+: 3e f2 ff d0 notrack bnd call \*%eax
-[ ]*[a-f0-9]+: 3e 66 f2 ff d0 notrack bnd callw \*%ax
+[ ]*[a-f0-9]+: 3e 66 f2 ff d0 notrack bnd call \*%ax
[ ]*[a-f0-9]+: 3e f2 ff e0 notrack bnd jmp \*%eax
-[ ]*[a-f0-9]+: 3e 66 f2 ff e0 notrack bnd jmpw \*%ax
+[ ]*[a-f0-9]+: 3e 66 f2 ff e0 notrack bnd jmp \*%ax
[ ]*[a-f0-9]+: 3e f2 ff 10 notrack bnd call \*\(%eax\)
[ ]*[a-f0-9]+: 3e 66 f2 ff 10 notrack bnd callw \*\(%eax\)
[ ]*[a-f0-9]+: 3e f2 ff 20 notrack bnd jmp \*\(%eax\)
[ ]*[a-f0-9]+: 3e 66 f2 ff 20 notrack bnd jmpw \*\(%eax\)
[ ]*[a-f0-9]+: 3e f2 ff d0 notrack bnd call \*%eax
-[ ]*[a-f0-9]+: 3e 66 f2 ff d0 notrack bnd callw \*%ax
+[ ]*[a-f0-9]+: 3e 66 f2 ff d0 notrack bnd call \*%ax
[ ]*[a-f0-9]+: 3e f2 ff 10 notrack bnd call \*\(%eax\)
[ ]*[a-f0-9]+: 3e 66 f2 ff 10 notrack bnd callw \*\(%eax\)
[ ]*[a-f0-9]+: 3e ff d0 notrack call \*%eax
-[ ]*[a-f0-9]+: 3e 66 ff d0 notrack callw \*%ax
+[ ]*[a-f0-9]+: 3e 66 ff d0 notrack call \*%ax
[ ]*[a-f0-9]+: 3e ff e0 notrack jmp \*%eax
-[ ]*[a-f0-9]+: 3e 66 ff e0 notrack jmpw \*%ax
+[ ]*[a-f0-9]+: 3e 66 ff e0 notrack jmp \*%ax
[ ]*[a-f0-9]+: 3e ff 10 notrack call \*\(%eax\)
[ ]*[a-f0-9]+: 3e 66 ff 10 notrack callw \*\(%eax\)
[ ]*[a-f0-9]+: 3e ff 20 notrack jmp \*\(%eax\)
[ ]*[a-f0-9]+: 3e 66 ff 20 notrack jmpw \*\(%eax\)
[ ]*[a-f0-9]+: 3e f2 ff d0 notrack bnd call \*%eax
-[ ]*[a-f0-9]+: 3e 66 f2 ff d0 notrack bnd callw \*%ax
+[ ]*[a-f0-9]+: 3e 66 f2 ff d0 notrack bnd call \*%ax
[ ]*[a-f0-9]+: 3e f2 ff e0 notrack bnd jmp \*%eax
-[ ]*[a-f0-9]+: 3e 66 f2 ff e0 notrack bnd jmpw \*%ax
+[ ]*[a-f0-9]+: 3e 66 f2 ff e0 notrack bnd jmp \*%ax
[ ]*[a-f0-9]+: 3e f2 ff 10 notrack bnd call \*\(%eax\)
[ ]*[a-f0-9]+: 3e 66 f2 ff 10 notrack bnd callw \*\(%eax\)
[ ]*[a-f0-9]+: 3e f2 ff 20 notrack bnd jmp \*\(%eax\)
[ ]*[a-f0-9]+: 3e 66 f2 ff 20 notrack bnd jmpw \*\(%eax\)
[ ]*[a-f0-9]+: 3e f2 ff d0 notrack bnd call \*%eax
-[ ]*[a-f0-9]+: 3e 66 f2 ff d0 notrack bnd callw \*%ax
+[ ]*[a-f0-9]+: 3e 66 f2 ff d0 notrack bnd call \*%ax
[ ]*[a-f0-9]+: 3e f2 ff 10 notrack bnd call \*\(%eax\)
[ ]*[a-f0-9]+: 3e 66 f2 ff 10 notrack bnd callw \*\(%eax\)
[ ]*[a-f0-9]+: f2 3e ff d0 bnd notrack call \*%eax
-[ ]*[a-f0-9]+: 66 3e ff d0 notrack callw \*%ax
+[ ]*[a-f0-9]+: 66 3e ff d0 notrack call \*%ax
#pass
diff --git a/gas/testsuite/gas/i386/opcode.d b/gas/testsuite/gas/i386/opcode.d
index a4f2e595bf6..cc57b9edb80 100644
--- a/gas/testsuite/gas/i386/opcode.d
+++ b/gas/testsuite/gas/i386/opcode.d
@@ -140,7 +140,7 @@ Disassembly of section .text:
1b5: 8c 90 90 90 90 90 [ ]*mov %ss,-0x6f6f6f70\(%eax\)
1bb: 8d 90 90 90 90 90 [ ]*lea -0x6f6f6f70\(%eax\),%edx
1c1: 8e 90 90 90 90 90 [ ]*mov -0x6f6f6f70\(%eax\),%ss
- 1c7: 8f 80 90 90 90 90 [ ]*popl -0x6f6f6f70\(%eax\)
+ 1c7: 8f 80 90 90 90 90 [ ]*pop -0x6f6f6f70\(%eax\)
1cd: 90 [ ]*nop
1ce: 91 [ ]*xchg %eax,%ecx
1cf: 92 [ ]*xchg %eax,%edx
diff --git a/gas/testsuite/gas/i386/solaris/x86-64-branch-2.d b/gas/testsuite/gas/i386/solaris/x86-64-branch-2.d
index 7c460c749b4..6465a3702bf 100644
--- a/gas/testsuite/gas/i386/solaris/x86-64-branch-2.d
+++ b/gas/testsuite/gas/i386/solaris/x86-64-branch-2.d
@@ -9,12 +9,12 @@ Disassembly of section .text:
0+ <bar-0xb>:
[ ]*[a-f0-9]+: 66 e9 00 00 jmpw 4 <bar-0x7> 2: R_X86_64_PC16 foo-0x2
-[ ]*[a-f0-9]+: 66 48 e9 00 00 00 00 data16 jmpq b <bar> 7: R_X86_64_PC32 foo-0x4
+[ ]*[a-f0-9]+: 66 48 e9 00 00 00 00 data16 rex\.W jmp b <bar> 7: R_X86_64_PC32 foo-0x4
0+b <bar>:
[ ]*[a-f0-9]+: 89 c3 mov %eax,%ebx
[ ]*[a-f0-9]+: 66 e8 00 00 callw 11 <bar\+0x6> f: R_X86_64_PC16 foo-0x2
-[ ]*[a-f0-9]+: 66 48 e8 00 00 00 00 data16 callq 18 <bar\+0xd> 14: R_X86_64_PC32 foo-0x4
+[ ]*[a-f0-9]+: 66 48 e8 00 00 00 00 data16 rex\.W call 18 <bar\+0xd> 14: R_X86_64_PC32 foo-0x4
[ ]*[a-f0-9]+: 66 c3 retw *
[ ]*[a-f0-9]+: 66 c2 08 00 retw \$0x8
#pass
diff --git a/gas/testsuite/gas/i386/solaris/x86-64-jump.d b/gas/testsuite/gas/i386/solaris/x86-64-jump.d
index 723ef28e935..0c9430cb699 100644
--- a/gas/testsuite/gas/i386/solaris/x86-64-jump.d
+++ b/gas/testsuite/gas/i386/solaris/x86-64-jump.d
@@ -9,19 +9,19 @@ Disassembly of section .text:
0+ <.text>:
[ ]*[a-f0-9]+: eb fe jmp (0x0|0 <.text>)
-[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq 0x7 3: R_X86_64_PC32 xxx-0x4
-[ ]*[a-f0-9]+: ff 24 25 00 00 00 00 jmpq \*0x0 a: R_X86_64_32S xxx
-[ ]*[a-f0-9]+: ff e7 jmpq \*%rdi
-[ ]*[a-f0-9]+: ff 27 jmpq \*\(%rdi\)
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 0x7 3: R_X86_64_PC32 xxx-0x4
+[ ]*[a-f0-9]+: ff 24 25 00 00 00 00 jmp \*0x0 a: R_X86_64_32S xxx
+[ ]*[a-f0-9]+: ff e7 jmp \*%rdi
+[ ]*[a-f0-9]+: ff 27 jmp \*\(%rdi\)
[ ]*[a-f0-9]+: ff 2c bd 00 00 00 00 ljmp \*0x0\(,%rdi,4\) 15: R_X86_64_32S xxx
[ ]*[a-f0-9]+: 66 ff 2c bd 00 00 00 00 ljmpw \*0x0\(,%rdi,4\) 1d: R_X86_64_32S xxx
[ ]*[a-f0-9]+: ff 2c 25 00 00 00 00 ljmp \*0x0 24: R_X86_64_32S xxx
[ ]*[a-f0-9]+: 66 ff 2c 25 00 00 00 00 ljmpw \*0x0 2c: R_X86_64_32S xxx
-[ ]*[a-f0-9]+: e8 cb ff ff ff callq 0x0
-[ ]*[a-f0-9]+: e8 00 00 00 00 callq 0x3a 36: R_X86_64_PC32 xxx-0x4
-[ ]*[a-f0-9]+: ff 14 25 00 00 00 00 callq \*0x0 3d: R_X86_64_32S xxx
-[ ]*[a-f0-9]+: ff d7 callq \*%rdi
-[ ]*[a-f0-9]+: ff 17 callq \*\(%rdi\)
+[ ]*[a-f0-9]+: e8 cb ff ff ff call 0x0
+[ ]*[a-f0-9]+: e8 00 00 00 00 call 0x3a 36: R_X86_64_PC32 xxx-0x4
+[ ]*[a-f0-9]+: ff 14 25 00 00 00 00 call \*0x0 3d: R_X86_64_32S xxx
+[ ]*[a-f0-9]+: ff d7 call \*%rdi
+[ ]*[a-f0-9]+: ff 17 call \*\(%rdi\)
[ ]*[a-f0-9]+: ff 1c bd 00 00 00 00 lcall \*0x0\(,%rdi,4\) 48: R_X86_64_32S xxx
[ ]*[a-f0-9]+: 66 ff 1c bd 00 00 00 00 lcallw \*0x0\(,%rdi,4\) 50: R_X86_64_32S xxx
[ ]*[a-f0-9]+: ff 1c 25 00 00 00 00 lcall \*0x0 57: R_X86_64_32S xxx
@@ -33,14 +33,14 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 66 ff 13 callw \*\(%rbx\)
[ ]*[a-f0-9]+: 66 ff 1b lcallw \*\(%rbx\)
[ ]*[a-f0-9]+: ff 1b lcall \*\(%rbx\)
-[ ]*[a-f0-9]+: ff 13 callq \*\(%rbx\)
-[ ]*[a-f0-9]+: ff 13 callq \*\(%rbx\)
+[ ]*[a-f0-9]+: ff 13 call \*\(%rbx\)
+[ ]*[a-f0-9]+: ff 13 call \*\(%rbx\)
[ ]*[a-f0-9]+: ff 1b lcall \*\(%rbx\)
[ ]*[a-f0-9]+: 66 ff 23 jmpw \*\(%rbx\)
[ ]*[a-f0-9]+: 66 ff 2b ljmpw \*\(%rbx\)
[ ]*[a-f0-9]+: ff 2b ljmp \*\(%rbx\)
-[ ]*[a-f0-9]+: ff 23 jmpq \*\(%rbx\)
-[ ]*[a-f0-9]+: ff 23 jmpq \*\(%rbx\)
+[ ]*[a-f0-9]+: ff 23 jmp \*\(%rbx\)
+[ ]*[a-f0-9]+: ff 23 jmp \*\(%rbx\)
[ ]*[a-f0-9]+: ff 2b ljmp \*\(%rbx\)
[ ]*[a-f0-9]+: eb 00 jmp 0x[0-9a-f]*
[ ]*[a-f0-9]+: 90 nop
diff --git a/gas/testsuite/gas/i386/solaris/x86-64-mpx-branch-1.d b/gas/testsuite/gas/i386/solaris/x86-64-mpx-branch-1.d
index 23bba67a6e9..0db4c04a1f8 100644
--- a/gas/testsuite/gas/i386/solaris/x86-64-mpx-branch-1.d
+++ b/gas/testsuite/gas/i386/solaris/x86-64-mpx-branch-1.d
@@ -9,23 +9,23 @@
Disassembly of section .text:
0+ <foo1-0x1c>:
-[ ]*[a-f0-9]+: f2 e8 00 00 00 00 bnd callq 6 <foo1-0x16> 2: R_X86_64_PC32 \*ABS\*\+0x10003c
-[ ]*[a-f0-9]+: f2 e9 00 00 00 00 bnd jmpq c <foo1-0x10> 8: R_X86_64_PC32 \*ABS\*\+0x10003c
-[ ]*[a-f0-9]+: 66 f2 48 e8 00 00 00 00 data16 bnd callq 14 <foo1-0x8> 10: R_X86_64_PC32 \*ABS\*\+0x10003c
-[ ]*[a-f0-9]+: 66 f2 48 e9 00 00 00 00 data16 bnd jmpq 1c <foo1> 18: R_X86_64_PC32 \*ABS\*\+0x10003c
+[ ]*[a-f0-9]+: f2 e8 00 00 00 00 bnd call 6 <foo1-0x16> 2: R_X86_64_PC32 \*ABS\*\+0x10003c
+[ ]*[a-f0-9]+: f2 e9 00 00 00 00 bnd jmp c <foo1-0x10> 8: R_X86_64_PC32 \*ABS\*\+0x10003c
+[ ]*[a-f0-9]+: 66 f2 48 e8 00 00 00 00 data16 bnd rex\.W call 14 <foo1-0x8> 10: R_X86_64_PC32 \*ABS\*\+0x10003c
+[ ]*[a-f0-9]+: 66 f2 48 e9 00 00 00 00 data16 bnd rex\.W jmp 1c <foo1> 18: R_X86_64_PC32 \*ABS\*\+0x10003c
0+1c <foo1>:
[ ]*[a-f0-9]+: f2 eb fd bnd jmp 1c <foo1>
[ ]*[a-f0-9]+: f2 72 fa bnd jb 1c <foo1>
-[ ]*[a-f0-9]+: f2 e8 f4 ff ff ff bnd callq 1c <foo1>
+[ ]*[a-f0-9]+: f2 e8 f4 ff ff ff bnd call 1c <foo1>
[ ]*[a-f0-9]+: f2 eb 09 bnd jmp 34 <foo2>
[ ]*[a-f0-9]+: f2 72 06 bnd jb 34 <foo2>
-[ ]*[a-f0-9]+: f2 e8 00 00 00 00 bnd callq 34 <foo2>
+[ ]*[a-f0-9]+: f2 e8 00 00 00 00 bnd call 34 <foo2>
0+34 <foo2>:
-[ ]*[a-f0-9]+: f2 e9 00 00 00 00 bnd jmpq 3a <foo2\+0x6> 36: R_X86_64_PC32 foo-0x4
+[ ]*[a-f0-9]+: f2 e9 00 00 00 00 bnd jmp 3a <foo2\+0x6> 36: R_X86_64_PC32 foo-0x4
[ ]*[a-f0-9]+: f2 0f 82 00 00 00 00 bnd jb 41 <foo2\+0xd> 3d: R_X86_64_PC32 foo-0x4
-[ ]*[a-f0-9]+: f2 e8 00 00 00 00 bnd callq 47 <foo2\+0x13> 43: R_X86_64_PC32 foo-0x4
-[ ]*[a-f0-9]+: f2 e9 00 00 00 00 bnd jmpq 4d <foo2\+0x19> 49: R_X86_64_PLT32 foo-0x4
+[ ]*[a-f0-9]+: f2 e8 00 00 00 00 bnd call 47 <foo2\+0x13> 43: R_X86_64_PC32 foo-0x4
+[ ]*[a-f0-9]+: f2 e9 00 00 00 00 bnd jmp 4d <foo2\+0x19> 49: R_X86_64_PLT32 foo-0x4
[ ]*[a-f0-9]+: f2 0f 82 00 00 00 00 bnd jb 54 <foo2\+0x20> 50: R_X86_64_PLT32 foo-0x4
-[ ]*[a-f0-9]+: f2 e8 00 00 00 00 bnd callq 5a <foo2\+0x26> 56: R_X86_64_PLT32 foo-0x4
+[ ]*[a-f0-9]+: f2 e8 00 00 00 00 bnd call 5a <foo2\+0x26> 56: R_X86_64_PLT32 foo-0x4
diff --git a/gas/testsuite/gas/i386/solaris/x86-64-nop-3.d b/gas/testsuite/gas/i386/solaris/x86-64-nop-3.d
index d16ad0a89a0..3d1b5f15c94 100644
--- a/gas/testsuite/gas/i386/solaris/x86-64-nop-3.d
+++ b/gas/testsuite/gas/i386/solaris/x86-64-nop-3.d
@@ -17,5 +17,5 @@ Disassembly of section .text:
Disassembly of section .altinstr_replacement:
0+ <.altinstr_replacement>:
- +[a-f0-9]+: e9 00 00 00 00 jmpq 5 <_start\+0x5> 1: R_X86_64_PC32 foo-0x4
+ +[a-f0-9]+: e9 00 00 00 00 jmp 5 <_start\+0x5> 1: R_X86_64_PC32 foo-0x4
#pass
diff --git a/gas/testsuite/gas/i386/solaris/x86-64-nop-4.d b/gas/testsuite/gas/i386/solaris/x86-64-nop-4.d
index 14dae11e2ea..0382bf9c54f 100644
--- a/gas/testsuite/gas/i386/solaris/x86-64-nop-4.d
+++ b/gas/testsuite/gas/i386/solaris/x86-64-nop-4.d
@@ -20,5 +20,5 @@ Disassembly of section .altinstr_replacement:
+[a-f0-9]+: 89 c0 mov %eax,%eax
+[a-f0-9]+: 89 c0 mov %eax,%eax
+[a-f0-9]+: 89 c0 mov %eax,%eax
- +[a-f0-9]+: e9 00 00 00 00 jmpq b <_start\+0xb> 7: R_X86_64_PC32 foo-0x4
+ +[a-f0-9]+: e9 00 00 00 00 jmp b <_start\+0xb> 7: R_X86_64_PC32 foo-0x4
#pass
diff --git a/gas/testsuite/gas/i386/solaris/x86-64-nop-5.d b/gas/testsuite/gas/i386/solaris/x86-64-nop-5.d
index 93c85caaba2..3ca31a01dbd 100644
--- a/gas/testsuite/gas/i386/solaris/x86-64-nop-5.d
+++ b/gas/testsuite/gas/i386/solaris/x86-64-nop-5.d
@@ -23,5 +23,5 @@ Disassembly of section .altinstr_replacement:
+[a-f0-9]+: 89 c0 mov %eax,%eax
+[a-f0-9]+: 89 c0 mov %eax,%eax
+[a-f0-9]+: 89 c0 mov %eax,%eax
- +[a-f0-9]+: e9 00 00 00 00 jmpq d <_start\+0xd> 9: R_X86_64_PC32 foo-0x4
+ +[a-f0-9]+: e9 00 00 00 00 jmp d <_start\+0xd> 9: R_X86_64_PC32 foo-0x4
#pass
diff --git a/gas/testsuite/gas/i386/solaris/x86-64-relax-2.d b/gas/testsuite/gas/i386/solaris/x86-64-relax-2.d
index d7197904ab8..79ee801d6c6 100644
--- a/gas/testsuite/gas/i386/solaris/x86-64-relax-2.d
+++ b/gas/testsuite/gas/i386/solaris/x86-64-relax-2.d
@@ -10,25 +10,25 @@ Disassembly of section .text:
0+ <foo>:
[ ]*[a-f0-9]+: eb 24 jmp 26 <local>
[ ]*[a-f0-9]+: eb 1e jmp 22 <hidden_def>
-[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq 9 <foo\+0x9> 5: R_X86_64_PC32 global_def-0x4
-[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq e <foo\+0xe> a: R_X86_64_PLT32 global_def-0x4
-[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq 13 <foo\+0x13> f: R_X86_64_PC32 weak_def-0x4
-[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq 18 <foo\+0x18> 14: R_X86_64_PC32 weak_hidden_undef-0x4
-[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq 1d <foo\+0x1d> 19: R_X86_64_PC32 weak_hidden_def-0x4
-[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq 22 <hidden_def> 1e: R_X86_64_PC32 hidden_undef-0x4
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 9 <foo\+0x9> 5: R_X86_64_PC32 global_def-0x4
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp e <foo\+0xe> a: R_X86_64_PLT32 global_def-0x4
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 13 <foo\+0x13> f: R_X86_64_PC32 weak_def-0x4
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 18 <foo\+0x18> 14: R_X86_64_PC32 weak_hidden_undef-0x4
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 1d <foo\+0x1d> 19: R_X86_64_PC32 weak_hidden_def-0x4
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 22 <hidden_def> 1e: R_X86_64_PC32 hidden_undef-0x4
0+22 <hidden_def>:
-[ ]*[a-f0-9]+: c3 retq
+[ ]*[a-f0-9]+: c3 ret *
0+23 <weak_hidden_def>:
-[ ]*[a-f0-9]+: c3 retq
+[ ]*[a-f0-9]+: c3 ret *
0+24 <global_def>:
-[ ]*[a-f0-9]+: c3 retq
+[ ]*[a-f0-9]+: c3 ret *
0+25 <weak_def>:
-[ ]*[a-f0-9]+: c3 retq
+[ ]*[a-f0-9]+: c3 ret *
0+26 <local>:
-[ ]*[a-f0-9]+: c3 retq
+[ ]*[a-f0-9]+: c3 ret *
#pass
diff --git a/gas/testsuite/gas/i386/solaris/x86-64-relax-3.d b/gas/testsuite/gas/i386/solaris/x86-64-relax-3.d
index 86a6a6566ee..0cfd77d35a3 100644
--- a/gas/testsuite/gas/i386/solaris/x86-64-relax-3.d
+++ b/gas/testsuite/gas/i386/solaris/x86-64-relax-3.d
@@ -10,24 +10,24 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: eb 21 jmp 23 <local>
[ ]*[a-f0-9]+: eb 1b jmp 1f <hidden_def>
[ ]*[a-f0-9]+: eb 1b jmp 21 <global_def>
-[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq b <foo\+0xb> 7: R_X86_64_PLT32 global_def-0x4
-[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq 10 <foo\+0x10> c: R_X86_64_PC32 weak_def-0x4
-[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq 15 <foo\+0x15> 11: R_X86_64_PC32 weak_hidden_undef-0x4
-[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq 1a <foo\+0x1a> 16: R_X86_64_PC32 weak_hidden_def-0x4
-[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq 1f <hidden_def> 1b: R_X86_64_PC32 hidden_undef-0x4
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp b <foo\+0xb> 7: R_X86_64_PLT32 global_def-0x4
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 10 <foo\+0x10> c: R_X86_64_PC32 weak_def-0x4
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 15 <foo\+0x15> 11: R_X86_64_PC32 weak_hidden_undef-0x4
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 1a <foo\+0x1a> 16: R_X86_64_PC32 weak_hidden_def-0x4
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 1f <hidden_def> 1b: R_X86_64_PC32 hidden_undef-0x4
0+1f <hidden_def>:
-[ ]*[a-f0-9]+: c3 retq
+[ ]*[a-f0-9]+: c3 ret *
0+20 <weak_hidden_def>:
-[ ]*[a-f0-9]+: c3 retq
+[ ]*[a-f0-9]+: c3 ret *
0+21 <global_def>:
-[ ]*[a-f0-9]+: c3 retq
+[ ]*[a-f0-9]+: c3 ret *
0+22 <weak_def>:
-[ ]*[a-f0-9]+: c3 retq
+[ ]*[a-f0-9]+: c3 ret *
0+23 <local>:
-[ ]*[a-f0-9]+: c3 retq
+[ ]*[a-f0-9]+: c3 ret *
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1a.d b/gas/testsuite/gas/i386/x86-64-align-branch-1a.d
index 0a5c8afcd3f..452904e1f65 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-1a.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-1a.d
@@ -73,5 +73,5 @@ Disassembly of section .text:
be: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\)
c4: eb c2 jmp (0x)?88( .*)?
c6: 5d pop %rbp
- c7: c3 retq
+ c7: c3 ret *
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1b.d b/gas/testsuite/gas/i386/x86-64-align-branch-1b.d
index 375a31a8b26..1c63f37f27d 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-1b.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-1b.d
@@ -73,5 +73,5 @@ Disassembly of section .text:
be: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\)
c4: eb c2 jmp (0x)?88( .*)?
c6: 5d pop %rbp
- c7: c3 retq
+ c7: c3 ret *
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1c.d b/gas/testsuite/gas/i386/x86-64-align-branch-1c.d
index b4e1c77bf90..cc7158f3646 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-1c.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-1c.d
@@ -73,5 +73,5 @@ Disassembly of section .text:
be: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\)
c4: eb c2 jmp (0x)?88( .*)?
c6: 5d pop %rbp
- c7: c3 retq
+ c7: c3 ret *
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1d.d b/gas/testsuite/gas/i386/x86-64-align-branch-1d.d
index c72b0176273..780663c4f0d 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-1d.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-1d.d
@@ -72,5 +72,5 @@ Disassembly of section .text:
bc: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\)
c2: eb c2 jmp (0x)?86( .*)?
c4: 5d pop %rbp
- c5: c3 retq
+ c5: c3 ret *
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1e.d b/gas/testsuite/gas/i386/x86-64-align-branch-1e.d
index 77b6253ac11..9bb1a1cf2d3 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-1e.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-1e.d
@@ -72,5 +72,5 @@ Disassembly of section .text:
b9: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\)
bf: eb c2 jmp (0x)?83( .*)?
c1: 5d pop %rbp
- c2: c3 retq
+ c2: c3 ret *
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1f.d b/gas/testsuite/gas/i386/x86-64-align-branch-1f.d
index aed81698734..43812020797 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-1f.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-1f.d
@@ -73,5 +73,5 @@ Disassembly of section .text:
bb: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\)
c1: eb c2 jmp (0x)?85( .*)?
c3: 5d pop %rbp
- c4: c3 retq
+ c4: c3 ret *
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1g.d b/gas/testsuite/gas/i386/x86-64-align-branch-1g.d
index d468c385b3f..0e5d881a080 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-1g.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-1g.d
@@ -73,5 +73,5 @@ Disassembly of section .text:
be: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\)
c4: eb c2 jmp (0x)?88( .*)?
c6: 5d pop %rbp
- c7: c3 retq
+ c7: c3 ret *
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1h.d b/gas/testsuite/gas/i386/x86-64-align-branch-1h.d
index cee73617afe..ce7879e2178 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-1h.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-1h.d
@@ -72,5 +72,5 @@ Disassembly of section .text:
b8: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\)
be: eb c2 jmp (0x)?82( .*)?
c0: 5d pop %rbp
- c1: c3 retq
+ c1: c3 ret *
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1i.d b/gas/testsuite/gas/i386/x86-64-align-branch-1i.d
index 67b1b1507c9..dfef04cd170 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-1i.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-1i.d
@@ -76,5 +76,5 @@ Disassembly of section .text:
be: 89 b5 50 fb ff ff mov %esi,-0x4b0\(%rbp\)
c4: eb c2 jmp (0x)?88( .*)?
c6: 5d pop %rbp
- c7: c3 retq
+ c7: c3 ret *
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-2a.d b/gas/testsuite/gas/i386/x86-64-align-branch-2a.d
index aaf759d42ed..4c7d2783a21 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-2a.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-2a.d
@@ -18,7 +18,7 @@ Disassembly of section .text:
15: 89 75 f4 mov %esi,-0xc\(%rbp\)
18: 89 75 f4 mov %esi,-0xc\(%rbp\)
1b: 89 75 f4 mov %esi,-0xc\(%rbp\)
- 1e: ff e0 jmpq \*%rax
+ 1e: ff e0 jmp \*%rax
20: 55 push %rbp
21: 55 push %rbp
22: 64 89 04 25 01 00 00 00 mov %eax,%fs:0x1
@@ -28,7 +28,7 @@ Disassembly of section .text:
33: 89 75 f4 mov %esi,-0xc\(%rbp\)
36: 89 75 f4 mov %esi,-0xc\(%rbp\)
39: 89 75 f4 mov %esi,-0xc\(%rbp\)
- 3c: ff d0 callq \*%rax
+ 3c: ff d0 call \*%rax
3e: 89 75 f4 mov %esi,-0xc\(%rbp\)
41: 55 push %rbp
42: 55 push %rbp
@@ -37,7 +37,7 @@ Disassembly of section .text:
4e: 89 75 f4 mov %esi,-0xc\(%rbp\)
51: 89 75 f4 mov %esi,-0xc\(%rbp\)
54: 89 75 f4 mov %esi,-0xc\(%rbp\)
- 57: e8 [0-9a-f ]+ callq .*
+ 57: e8 [0-9a-f ]+ call .*
5c: 89 75 f4 mov %esi,-0xc\(%rbp\)
5f: 55 push %rbp
60: 55 push %rbp
@@ -45,6 +45,6 @@ Disassembly of section .text:
62: 64 89 04 25 01 00 00 00 mov %eax,%fs:0x1
6a: 48 89 e5 mov %rsp,%rbp
6d: 89 75 f4 mov %esi,-0xc\(%rbp\)
- 70: ff 14 25 00 00 00 00 callq \*0x0
+ 70: ff 14 25 00 00 00 00 call \*0x0
77: 55 push %rbp
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-2b.d b/gas/testsuite/gas/i386/x86-64-align-branch-2b.d
index 720868e363f..9064875dcf6 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-2b.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-2b.d
@@ -18,7 +18,7 @@ Disassembly of section .text:
17: 89 75 f4 mov %esi,-0xc\(%rbp\)
1a: 89 75 f4 mov %esi,-0xc\(%rbp\)
1d: 89 75 f4 mov %esi,-0xc\(%rbp\)
- 20: ff e0 jmpq \*%rax
+ 20: ff e0 jmp \*%rax
22: 2e 2e 55 cs cs push %rbp
25: 55 push %rbp
26: 64 89 04 25 01 00 00 00 mov %eax,%fs:0x1
@@ -28,7 +28,7 @@ Disassembly of section .text:
37: 89 75 f4 mov %esi,-0xc\(%rbp\)
3a: 89 75 f4 mov %esi,-0xc\(%rbp\)
3d: 89 75 f4 mov %esi,-0xc\(%rbp\)
- 40: ff d0 callq \*%rax
+ 40: ff d0 call \*%rax
42: 89 75 f4 mov %esi,-0xc\(%rbp\)
45: 55 push %rbp
46: 55 push %rbp
@@ -37,7 +37,7 @@ Disassembly of section .text:
52: 89 75 f4 mov %esi,-0xc\(%rbp\)
55: 89 75 f4 mov %esi,-0xc\(%rbp\)
58: 89 75 f4 mov %esi,-0xc\(%rbp\)
- 5b: e8 [0-9a-f ]+ callq .*
+ 5b: e8 [0-9a-f ]+ call .*
60: 89 75 f4 mov %esi,-0xc\(%rbp\)
63: 55 push %rbp
64: 55 push %rbp
@@ -45,6 +45,6 @@ Disassembly of section .text:
66: 64 89 04 25 01 00 00 00 mov %eax,%fs:0x1
6e: 48 89 e5 mov %rsp,%rbp
71: 89 75 f4 mov %esi,-0xc\(%rbp\)
- 74: ff 14 25 00 00 00 00 callq \*0x0
+ 74: ff 14 25 00 00 00 00 call \*0x0
7b: 55 push %rbp
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-2c.d b/gas/testsuite/gas/i386/x86-64-align-branch-2c.d
index fb87c49cd5d..7e28c328dc9 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-2c.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-2c.d
@@ -18,7 +18,7 @@ Disassembly of section .text:
17: 89 75 f4 mov %esi,-0xc\(%rbp\)
1a: 89 75 f4 mov %esi,-0xc\(%rbp\)
1d: 89 75 f4 mov %esi,-0xc\(%rbp\)
- 20: ff e0 jmpq \*%rax
+ 20: ff e0 jmp \*%rax
22: 2e 2e 55 cs cs push %rbp
25: 55 push %rbp
26: 64 89 04 25 01 00 00 00 mov %eax,%fs:0x1
@@ -28,7 +28,7 @@ Disassembly of section .text:
37: 89 75 f4 mov %esi,-0xc\(%rbp\)
3a: 89 75 f4 mov %esi,-0xc\(%rbp\)
3d: 89 75 f4 mov %esi,-0xc\(%rbp\)
- 40: ff d0 callq \*%rax
+ 40: ff d0 call \*%rax
42: 2e 2e 2e 2e 2e 89 75 f4 cs cs cs cs mov %esi,%cs:-0xc\(%rbp\)
4a: 55 push %rbp
4b: 55 push %rbp
@@ -37,7 +37,7 @@ Disassembly of section .text:
57: 89 75 f4 mov %esi,-0xc\(%rbp\)
5a: 89 75 f4 mov %esi,-0xc\(%rbp\)
5d: 89 75 f4 mov %esi,-0xc\(%rbp\)
- 60: e8 [0-9a-f ]+ callq .*
+ 60: e8 [0-9a-f ]+ call .*
65: 2e 2e 2e 2e 2e 89 75 f4 cs cs cs cs mov %esi,%cs:-0xc\(%rbp\)
6d: 2e 2e 55 cs cs push %rbp
70: 55 push %rbp
@@ -45,6 +45,6 @@ Disassembly of section .text:
72: 64 89 04 25 01 00 00 00 mov %eax,%fs:0x1
7a: 48 89 e5 mov %rsp,%rbp
7d: 89 75 f4 mov %esi,-0xc\(%rbp\)
- 80: ff 14 25 00 00 00 00 callq \*0x0
+ 80: ff 14 25 00 00 00 00 call \*0x0
87: 55 push %rbp
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-3.d b/gas/testsuite/gas/i386/x86-64-align-branch-3.d
index 18767a70458..fa289df239c 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-3.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-3.d
@@ -17,7 +17,7 @@ Disassembly of section .text:
15: 89 75 f4 mov %esi,-0xc\(%rbp\)
18: 89 75 f4 mov %esi,-0xc\(%rbp\)
1b: 89 75 f4 mov %esi,-0xc\(%rbp\)
- 1e: e8 00 00 00 00 callq 23 <foo\+0x23>
+ 1e: e8 00 00 00 00 call 23 <foo\+0x23>
23: 55 push %rbp
24: 55 push %rbp
25: 64 89 04 25 01 00 00 00 mov %eax,%fs:0x1
@@ -27,6 +27,6 @@ Disassembly of section .text:
36: 89 75 f4 mov %esi,-0xc\(%rbp\)
39: 89 75 f4 mov %esi,-0xc\(%rbp\)
3c: 89 75 f4 mov %esi,-0xc\(%rbp\)
- 3f: ff 15 00 00 00 00 callq \*0x0\(%rip\) # 45 <foo\+0x45>
+ 3f: ff 15 00 00 00 00 call \*0x0\(%rip\) # 45 <foo\+0x45>
45: 89 75 f4 mov %esi,-0xc\(%rbp\)
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-4a.d b/gas/testsuite/gas/i386/x86-64-align-branch-4a.d
index 47318e832a1..40f8c665e31 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-4a.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-4a.d
@@ -17,7 +17,7 @@ Disassembly of section .text:
16: 89 75 f4 mov %esi,-0xc\(%rbp\)
19: 89 75 f4 mov %esi,-0xc\(%rbp\)
1c: 89 75 f4 mov %esi,-0xc\(%rbp\)
- 1f: c3 retq
+ 1f: c3 ret *
20: 55 push %rbp
21: 64 89 04 25 01 00 00 00 mov %eax,%fs:0x1
29: 55 push %rbp
@@ -28,6 +28,6 @@ Disassembly of section .text:
34: 89 75 f4 mov %esi,-0xc\(%rbp\)
37: 89 75 f4 mov %esi,-0xc\(%rbp\)
3a: 89 75 f4 mov %esi,-0xc\(%rbp\)
- 3d: c2 1e 00 retq \$0x1e
+ 3d: c2 1e 00 ret \$0x1e
40: 55 push %rbp
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-4b.d b/gas/testsuite/gas/i386/x86-64-align-branch-4b.d
index 9a030dd246e..e90b3592fe7 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-4b.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-4b.d
@@ -17,7 +17,7 @@ Disassembly of section .text:
17: 89 75 f4 mov %esi,-0xc\(%rbp\)
1a: 89 75 f4 mov %esi,-0xc\(%rbp\)
1d: 89 75 f4 mov %esi,-0xc\(%rbp\)
- 20: c3 retq
+ 20: c3 ret *
21: 2e 2e 55 cs cs push %rbp
24: 64 89 04 25 01 00 00 00 mov %eax,%fs:0x1
2c: 55 push %rbp
@@ -28,6 +28,6 @@ Disassembly of section .text:
37: 89 75 f4 mov %esi,-0xc\(%rbp\)
3a: 89 75 f4 mov %esi,-0xc\(%rbp\)
3d: 89 75 f4 mov %esi,-0xc\(%rbp\)
- 40: c2 1e 00 retq \$0x1e
+ 40: c2 1e 00 ret \$0x1e
43: 55 push %rbp
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-5.d b/gas/testsuite/gas/i386/x86-64-align-branch-5.d
index 9770a4a07f9..fd3fe605e78 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-5.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-5.d
@@ -33,7 +33,7 @@ Disassembly of section .text:
38: c1 e9 02 shr \$0x2,%ecx
3b: c1 e9 02 shr \$0x2,%ecx
3e: f6 c2 02 test \$0x2,%dl
- 41: e8 00 00 00 00 callq (0x)?46( .*)?
+ 41: e8 00 00 00 00 call (0x)?46( .*)?
46: 75 e3 jne (0x)?2b( .*)?
48: 31 c0 xor %eax,%eax
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-6.d b/gas/testsuite/gas/i386/x86-64-align-branch-6.d
index 59a157c8091..213c26afdca 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-6.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-6.d
@@ -15,5 +15,5 @@ Disassembly of section .text:
+[a-f0-9]+: 66 66 2e 0f 1f 84 00 00 00 00 00 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[a-f0-9]+: 0f 1f 80 00 00 00 00 nopl 0x0\(%rax\)
+[a-f0-9]+: f2 73 bf bnd jae 0 <_start>
- +[a-f0-9]+: c3 retq
+ +[a-f0-9]+: c3 ret *
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-branch-2.d b/gas/testsuite/gas/i386/x86-64-branch-2.d
index 612cb69115d..fab75a6394c 100644
--- a/gas/testsuite/gas/i386/x86-64-branch-2.d
+++ b/gas/testsuite/gas/i386/x86-64-branch-2.d
@@ -9,12 +9,12 @@ Disassembly of section .text:
0+ <bar-0xb>:
[ ]*[a-f0-9]+: 66 e9 00 00 jmpw 4 <bar-0x7> 2: R_X86_64_PC16 foo-0x2
-[ ]*[a-f0-9]+: 66 48 e9 00 00 00 00 data16 jmpq b <bar> 7: R_X86_64_PLT32 foo-0x4
+[ ]*[a-f0-9]+: 66 48 e9 00 00 00 00 data16 rex\.W jmp b <bar> 7: R_X86_64_PLT32 foo-0x4
0+b <bar>:
[ ]*[a-f0-9]+: 89 c3 mov %eax,%ebx
[ ]*[a-f0-9]+: 66 e8 00 00 callw 11 <bar\+0x6> f: R_X86_64_PC16 foo-0x2
-[ ]*[a-f0-9]+: 66 48 e8 00 00 00 00 data16 callq 18 <bar\+0xd> 14: R_X86_64_PLT32 foo-0x4
+[ ]*[a-f0-9]+: 66 48 e8 00 00 00 00 data16 rex\.W call 18 <bar\+0xd> 14: R_X86_64_PLT32 foo-0x4
[ ]*[a-f0-9]+: 66 c3 retw *
[ ]*[a-f0-9]+: 66 c2 08 00 retw \$0x8
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-branch-3.d b/gas/testsuite/gas/i386/x86-64-branch-3.d
index 48fef0083d8..99ccc85cdc3 100644
--- a/gas/testsuite/gas/i386/x86-64-branch-3.d
+++ b/gas/testsuite/gas/i386/x86-64-branch-3.d
@@ -8,15 +8,15 @@
Disassembly of section .text:
0+ <bar-0xd>:
-[ ]*[a-f0-9]+: 66 e9 00 00 00 00 data16 jmpq 6 <bar-0x7> 2: R_X86_64_PLT32 foo-0x4
-[ ]*[a-f0-9]+: 66 48 e9 00 00 00 00 data16 rex\.W jmpq d <bar> 9: R_X86_64_PLT32 foo-0x4
+[ ]*[a-f0-9]+: 66 e9 00 00 00 00 data16 jmp 6 <bar-0x7> 2: R_X86_64_PLT32 foo-0x4
+[ ]*[a-f0-9]+: 66 48 e9 00 00 00 00 data16 rex\.W jmp d <bar> 9: R_X86_64_PLT32 foo-0x4
0+d <bar>:
[ ]*[a-f0-9]+: 89 c3 mov %eax,%ebx
-[ ]*[a-f0-9]+: 66 e8 00 00 00 00 data16 callq 15 <bar\+0x8> 11: R_X86_64_PLT32 foo-0x4
-[ ]*[a-f0-9]+: 66 48 e8 00 00 00 00 data16 rex\.W callq 1c <bar\+0xf> 18: R_X86_64_PLT32 foo-0x4
+[ ]*[a-f0-9]+: 66 e8 00 00 00 00 data16 call 15 <bar\+0x8> 11: R_X86_64_PLT32 foo-0x4
+[ ]*[a-f0-9]+: 66 48 e8 00 00 00 00 data16 rex\.W call 1c <bar\+0xf> 18: R_X86_64_PLT32 foo-0x4
[ ]*[a-f0-9]+: 66 c7 f8 00 00 xbeginw 21 <bar\+0x14> 1f: R_X86_64_PC16 foo-0x2
-[ ]*[a-f0-9]+: 66 48 c7 f8 00 00 00 00 data16 xbeginq 29 <bar\+0x1c> 25: R_X86_64_PLT32 foo-0x4
+[ ]*[a-f0-9]+: 66 48 c7 f8 00 00 00 00 data16 rex\.W xbegin 29 <bar\+0x1c> 25: R_X86_64_PLT32 foo-0x4
[ ]*[a-f0-9]+: 48 ff 18 lcallq \*\(%rax\)
[ ]*[a-f0-9]+: 48 ff 29 ljmpq \*\(%rcx\)
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-branch.d b/gas/testsuite/gas/i386/x86-64-branch.d
index 8b988141864..2618134b401 100644
--- a/gas/testsuite/gas/i386/x86-64-branch.d
+++ b/gas/testsuite/gas/i386/x86-64-branch.d
@@ -7,35 +7,35 @@
Disassembly of section .text:
0+ <.text>:
-[ ]*[a-f0-9]+: ff d0 callq \*%rax
-[ ]*[a-f0-9]+: ff d0 callq \*%rax
-[ ]*[a-f0-9]+: 66 ff d0 data16 callq \*%rax
-[ ]*[a-f0-9]+: 66 ff d0 data16 callq \*%rax
-[ ]*[a-f0-9]+: 66 ff 10 data16 callq \*\(%rax\)
-[ ]*[a-f0-9]+: ff e0 jmpq \*%rax
-[ ]*[a-f0-9]+: ff e0 jmpq \*%rax
-[ ]*[a-f0-9]+: 66 ff e0 data16 jmpq \*%rax
-[ ]*[a-f0-9]+: 66 ff e0 data16 jmpq \*%rax
-[ ]*[a-f0-9]+: 66 ff 20 data16 jmpq \*\(%rax\)
-[ ]*[a-f0-9]+: e8 (00|5b) 00 (00|10) 00 callq (0x1f|10007a <.text\+0x10007a>)
-[ ]*[a-f0-9]+: e9 (00|60) 00 (00|10) 00 jmpq (0x24|100084 <.text\+0x100084>)
-[ ]*[a-f0-9]+: 66 e8 00 00 00 00 data16 callq (0x2a|2a <.text\+0x2a>)
-[ ]*[a-f0-9]+: 66 e9 00 00 00 00 data16 jmpq (0x30|30 <.text\+0x30>)
+[ ]*[a-f0-9]+: ff d0 call \*%rax
+[ ]*[a-f0-9]+: ff d0 call \*%rax
+[ ]*[a-f0-9]+: 66 ff d0 data16 call \*%rax
+[ ]*[a-f0-9]+: 66 ff d0 data16 call \*%rax
+[ ]*[a-f0-9]+: 66 ff 10 data16 call \*\(%rax\)
+[ ]*[a-f0-9]+: ff e0 jmp \*%rax
+[ ]*[a-f0-9]+: ff e0 jmp \*%rax
+[ ]*[a-f0-9]+: 66 ff e0 data16 jmp \*%rax
+[ ]*[a-f0-9]+: 66 ff e0 data16 jmp \*%rax
+[ ]*[a-f0-9]+: 66 ff 20 data16 jmp \*\(%rax\)
+[ ]*[a-f0-9]+: e8 (00|5b) 00 (00|10) 00 call (0x1f|10007a <.text\+0x10007a>)
+[ ]*[a-f0-9]+: e9 (00|60) 00 (00|10) 00 jmp (0x24|100084 <.text\+0x100084>)
+[ ]*[a-f0-9]+: 66 e8 00 00 00 00 data16 call (0x2a|2a <.text\+0x2a>)
+[ ]*[a-f0-9]+: 66 e9 00 00 00 00 data16 jmp (0x30|30 <.text\+0x30>)
[ ]*[a-f0-9]+: 66 0f 82 00 00 00 00 data16 jb (0x37|37 <.text\+0x37>)
-[ ]*[a-f0-9]+: 66 c3 data16 retq *
-[ ]*[a-f0-9]+: 66 c2 08 00 data16 retq \$0x8
-[ ]*[a-f0-9]+: ff d0 callq \*%rax
-[ ]*[a-f0-9]+: ff d0 callq \*%rax
-[ ]*[a-f0-9]+: 66 ff d0 data16 callq \*%rax
-[ ]*[a-f0-9]+: 66 ff d0 data16 callq \*%rax
-[ ]*[a-f0-9]+: 66 ff 10 data16 callq \*\(%rax\)
-[ ]*[a-f0-9]+: ff e0 jmpq \*%rax
-[ ]*[a-f0-9]+: ff e0 jmpq \*%rax
-[ ]*[a-f0-9]+: 66 ff e0 data16 jmpq \*%rax
-[ ]*[a-f0-9]+: 66 ff e0 data16 jmpq \*%rax
-[ ]*[a-f0-9]+: 66 ff 20 data16 jmpq \*\(%rax\)
-[ ]*[a-f0-9]+: e8 .. 00 (00|10) 00 callq (0x[0-9a-f]*|100[0-9a-f]* <.text\+0x100[0-9a-f]*>)
-[ ]*[a-f0-9]+: e9 .. 00 (00|10) 00 jmpq (0x[0-9a-f]*|100[0-9a-f]* <.text\+0x100[0-9a-f]*>)
-[ ]*[a-f0-9]+: 66 c3 data16 retq *
-[ ]*[a-f0-9]+: 66 c2 08 00 data16 retq \$0x8
+[ ]*[a-f0-9]+: 66 c3 data16 ret *
+[ ]*[a-f0-9]+: 66 c2 08 00 data16 ret \$0x8
+[ ]*[a-f0-9]+: ff d0 call \*%rax
+[ ]*[a-f0-9]+: ff d0 call \*%rax
+[ ]*[a-f0-9]+: 66 ff d0 data16 call \*%rax
+[ ]*[a-f0-9]+: 66 ff d0 data16 call \*%rax
+[ ]*[a-f0-9]+: 66 ff 10 data16 call \*\(%rax\)
+[ ]*[a-f0-9]+: ff e0 jmp \*%rax
+[ ]*[a-f0-9]+: ff e0 jmp \*%rax
+[ ]*[a-f0-9]+: 66 ff e0 data16 jmp \*%rax
+[ ]*[a-f0-9]+: 66 ff e0 data16 jmp \*%rax
+[ ]*[a-f0-9]+: 66 ff 20 data16 jmp \*\(%rax\)
+[ ]*[a-f0-9]+: e8 .. 00 (00|10) 00 call (0x[0-9a-f]*|100[0-9a-f]* <.text\+0x100[0-9a-f]*>)
+[ ]*[a-f0-9]+: e9 .. 00 (00|10) 00 jmp (0x[0-9a-f]*|100[0-9a-f]* <.text\+0x100[0-9a-f]*>)
+[ ]*[a-f0-9]+: 66 c3 data16 ret *
+[ ]*[a-f0-9]+: 66 c2 08 00 data16 ret \$0x8
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-disassem.d b/gas/testsuite/gas/i386/x86-64-disassem.d
index 62b8c44c90f..a9706b8abad 100644
--- a/gas/testsuite/gas/i386/x86-64-disassem.d
+++ b/gas/testsuite/gas/i386/x86-64-disassem.d
@@ -246,51 +246,51 @@ Disassembly of section \.text:
[ ]*[a-f0-9]+:[ ]*c4 e1 f9 99[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 30[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*8f 01[ ]*popq \(%rcx\)
+[ ]*[a-f0-9]+:[ ]*8f 01[ ]*pop \(%rcx\)
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 30[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*6a 01[ ]*pushq \$0x1
+[ ]*[a-f0-9]+:[ ]*6a 01[ ]*push \$0x1
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 30[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*04 01[ ]*add \$0x1,%al
[ ]*[a-f0-9]+:[ ]*c4 e3 79 30[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*8f 01[ ]*popq \(%rcx\)
+[ ]*[a-f0-9]+:[ ]*8f 01[ ]*pop \(%rcx\)
[ ]*[a-f0-9]+:[ ]*c4 e3 79 30[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*6a 01[ ]*pushq \$0x1
+[ ]*[a-f0-9]+:[ ]*6a 01[ ]*push \$0x1
[ ]*[a-f0-9]+:[ ]*c4 e3 79 30[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*04 01[ ]*add \$0x1,%al
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 31[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*8f 01[ ]*popq \(%rcx\)
+[ ]*[a-f0-9]+:[ ]*8f 01[ ]*pop \(%rcx\)
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 31[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*6a 01[ ]*pushq \$0x1
+[ ]*[a-f0-9]+:[ ]*6a 01[ ]*push \$0x1
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 31[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*04 01[ ]*add \$0x1,%al
[ ]*[a-f0-9]+:[ ]*c4 e3 79 31[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*8f 01[ ]*popq \(%rcx\)
+[ ]*[a-f0-9]+:[ ]*8f 01[ ]*pop \(%rcx\)
[ ]*[a-f0-9]+:[ ]*c4 e3 79 31[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*6a 01[ ]*pushq \$0x1
+[ ]*[a-f0-9]+:[ ]*6a 01[ ]*push \$0x1
[ ]*[a-f0-9]+:[ ]*c4 e3 79 31[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*04 01[ ]*add \$0x1,%al
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 32[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*8f 01[ ]*popq \(%rcx\)
+[ ]*[a-f0-9]+:[ ]*8f 01[ ]*pop \(%rcx\)
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 32[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*6a 01[ ]*pushq \$0x1
+[ ]*[a-f0-9]+:[ ]*6a 01[ ]*push \$0x1
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 32[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*04 01[ ]*add \$0x1,%al
[ ]*[a-f0-9]+:[ ]*c4 e3 79 32[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*8f 01[ ]*popq \(%rcx\)
+[ ]*[a-f0-9]+:[ ]*8f 01[ ]*pop \(%rcx\)
[ ]*[a-f0-9]+:[ ]*c4 e3 79 32[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*6a 01[ ]*pushq \$0x1
+[ ]*[a-f0-9]+:[ ]*6a 01[ ]*push \$0x1
[ ]*[a-f0-9]+:[ ]*c4 e3 79 32[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*04 01[ ]*add \$0x1,%al
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 33[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*8f 01[ ]*popq \(%rcx\)
+[ ]*[a-f0-9]+:[ ]*8f 01[ ]*pop \(%rcx\)
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 33[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*6a 01[ ]*pushq \$0x1
+[ ]*[a-f0-9]+:[ ]*6a 01[ ]*push \$0x1
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 33[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*04 01[ ]*add \$0x1,%al
[ ]*[a-f0-9]+:[ ]*c4 e3 79 33[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*8f 01[ ]*popq \(%rcx\)
+[ ]*[a-f0-9]+:[ ]*8f 01[ ]*pop \(%rcx\)
[ ]*[a-f0-9]+:[ ]*c4 e3 79 33[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*6a 01[ ]*pushq \$0x1
+[ ]*[a-f0-9]+:[ ]*6a 01[ ]*push \$0x1
[ ]*[a-f0-9]+:[ ]*c4 e3 79 33[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*04 01[ ]*add \$0x1,%al
[ ]*[a-f0-9]+:[ ]*c5 f8 92[ ]*\(bad\)[ ]*
@@ -346,9 +346,9 @@ Disassembly of section \.text:
[ ]*[a-f0-9]+:[ ]*62 72 ad 08 1c[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*01 01[ ]*add[ ]*%eax,\(%rcx\)
[ ]*[a-f0-9]+:[ ]*62 f3 7d 28 1b[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*c8 25 62 f3[ ]*enterq[ ]*\$0x6225,\$0xf3
+[ ]*[a-f0-9]+:[ ]*c8 25 62 f3[ ]*enter *\$0x6225,\$0xf3
[ ]*[a-f0-9]+:[ ]*62 f3 75 08 23[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*c2 25 62[ ]*retq[ ]*\$0x6225
+[ ]*[a-f0-9]+:[ ]*c2 25 62[ ]*ret *\$0x6225
[ ]*[a-f0-9]+:[ ]*62 f2 7d 28 5b[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*41 37[ ]*rex.B \(bad\)[ ]*
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-disp32.d b/gas/testsuite/gas/i386/x86-64-disp32.d
index d6397bfeb70..d245835de1a 100644
--- a/gas/testsuite/gas/i386/x86-64-disp32.d
+++ b/gas/testsuite/gas/i386/x86-64-disp32.d
@@ -18,7 +18,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 62 f1 fe 08 6f 98 c0 ff ff ff vmovdqu64 -0x40\(%rax\),%xmm3
[ ]*[a-f0-9]+: eb 07 jmp 30 <foo>
[ ]*[a-f0-9]+: eb 05 jmp 30 <foo>
-[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq 30 <foo>
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 30 <foo>
0+30 <foo>:
[ ]*[a-f0-9]+: 89 18 mov %ebx,\(%rax\)
diff --git a/gas/testsuite/gas/i386/x86-64-gotpcrel-no-relax.d b/gas/testsuite/gas/i386/x86-64-gotpcrel-no-relax.d
index a3f89436b3e..a390995f3d5 100644
--- a/gas/testsuite/gas/i386/x86-64-gotpcrel-no-relax.d
+++ b/gas/testsuite/gas/i386/x86-64-gotpcrel-no-relax.d
@@ -1,4 +1,5 @@
#source: x86-64-gotpcrel.s
+#name: x86-64 gotpcrel (no relax)
#as: -mrelax-relocations=no
#objdump: -dwr
@@ -12,16 +13,16 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 48 8b 04 25 00 00 00 00 mov 0x0,%rax b: R_X86_64_GOTPCREL foo
[ ]*[a-f0-9]+: 48 8b 05 00 00 00 00 mov 0x0\(%rip\),%rax # 16 <_start\+0x16> 12: R_X86_64_GOTPCREL foo-0x4
[ ]*[a-f0-9]+: 48 8b 81 00 00 00 00 mov 0x0\(%rcx\),%rax 19: R_X86_64_GOTPCREL foo
-[ ]*[a-f0-9]+: ff 15 00 00 00 00 callq \*0x0\(%rip\) # 23 <_start\+0x23> 1f: R_X86_64_GOTPCREL foo-0x4
-[ ]*[a-f0-9]+: ff 90 00 00 00 00 callq \*0x0\(%rax\) 25: R_X86_64_GOTPCREL foo
-[ ]*[a-f0-9]+: ff 25 00 00 00 00 jmpq \*0x0\(%rip\) # 2f <_start\+0x2f> 2b: R_X86_64_GOTPCREL foo-0x4
-[ ]*[a-f0-9]+: ff a1 00 00 00 00 jmpq \*0x0\(%rcx\) 31: R_X86_64_GOTPCREL foo
+[ ]*[a-f0-9]+: ff 15 00 00 00 00 call \*0x0\(%rip\) # 23 <_start\+0x23> 1f: R_X86_64_GOTPCREL foo-0x4
+[ ]*[a-f0-9]+: ff 90 00 00 00 00 call \*0x0\(%rax\) 25: R_X86_64_GOTPCREL foo
+[ ]*[a-f0-9]+: ff 25 00 00 00 00 jmp \*0x0\(%rip\) # 2f <_start\+0x2f> 2b: R_X86_64_GOTPCREL foo-0x4
+[ ]*[a-f0-9]+: ff a1 00 00 00 00 jmp \*0x0\(%rcx\) 31: R_X86_64_GOTPCREL foo
[ ]*[a-f0-9]+: 48 c7 c0 00 00 00 00 mov \$0x0,%rax 38: R_X86_64_GOTPCREL foo
[ ]*[a-f0-9]+: 48 8b 04 25 00 00 00 00 mov 0x0,%rax 40: R_X86_64_GOTPCREL foo
[ ]*[a-f0-9]+: 48 8b 05 00 00 00 00 mov 0x0\(%rip\),%rax # 4b <_start\+0x4b> 47: R_X86_64_GOTPCREL foo-0x4
[ ]*[a-f0-9]+: 48 8b 81 00 00 00 00 mov 0x0\(%rcx\),%rax 4e: R_X86_64_GOTPCREL foo
-[ ]*[a-f0-9]+: ff 15 00 00 00 00 callq \*0x0\(%rip\) # 58 <_start\+0x58> 54: R_X86_64_GOTPCREL foo-0x4
-[ ]*[a-f0-9]+: ff 90 00 00 00 00 callq \*0x0\(%rax\) 5a: R_X86_64_GOTPCREL foo
-[ ]*[a-f0-9]+: ff 25 00 00 00 00 jmpq \*0x0\(%rip\) # 64 <_start\+0x64> 60: R_X86_64_GOTPCREL foo-0x4
-[ ]*[a-f0-9]+: ff a1 00 00 00 00 jmpq \*0x0\(%rcx\) 66: R_X86_64_GOTPCREL foo
+[ ]*[a-f0-9]+: ff 15 00 00 00 00 call \*0x0\(%rip\) # 58 <_start\+0x58> 54: R_X86_64_GOTPCREL foo-0x4
+[ ]*[a-f0-9]+: ff 90 00 00 00 00 call \*0x0\(%rax\) 5a: R_X86_64_GOTPCREL foo
+[ ]*[a-f0-9]+: ff 25 00 00 00 00 jmp \*0x0\(%rip\) # 64 <_start\+0x64> 60: R_X86_64_GOTPCREL foo-0x4
+[ ]*[a-f0-9]+: ff a1 00 00 00 00 jmp \*0x0\(%rcx\) 66: R_X86_64_GOTPCREL foo
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-gotpcrel.d b/gas/testsuite/gas/i386/x86-64-gotpcrel.d
index fbe5e47ab14..57792216e9a 100644
--- a/gas/testsuite/gas/i386/x86-64-gotpcrel.d
+++ b/gas/testsuite/gas/i386/x86-64-gotpcrel.d
@@ -1,5 +1,6 @@
#as: -mrelax-relocations=yes
#objdump: -dwr
+#name: x86-64 gotpcrel
.*: +file format .*
@@ -11,16 +12,16 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 48 8b 04 25 00 00 00 00 mov 0x0,%rax b: R_X86_64_GOTPCREL foo
[ ]*[a-f0-9]+: 48 8b 05 00 00 00 00 mov 0x0\(%rip\),%rax # 16 <_start\+0x16> 12: R_X86_64_REX_GOTPCRELX foo-0x4
[ ]*[a-f0-9]+: 48 8b 81 00 00 00 00 mov 0x0\(%rcx\),%rax 19: R_X86_64_GOTPCREL foo
-[ ]*[a-f0-9]+: ff 15 00 00 00 00 callq \*0x0\(%rip\) # 23 <_start\+0x23> 1f: R_X86_64_GOTPCRELX foo-0x4
-[ ]*[a-f0-9]+: ff 90 00 00 00 00 callq \*0x0\(%rax\) 25: R_X86_64_GOTPCREL foo
-[ ]*[a-f0-9]+: ff 25 00 00 00 00 jmpq \*0x0\(%rip\) # 2f <_start\+0x2f> 2b: R_X86_64_GOTPCRELX foo-0x4
-[ ]*[a-f0-9]+: ff a1 00 00 00 00 jmpq \*0x0\(%rcx\) 31: R_X86_64_GOTPCREL foo
+[ ]*[a-f0-9]+: ff 15 00 00 00 00 call \*0x0\(%rip\) # 23 <_start\+0x23> 1f: R_X86_64_GOTPCRELX foo-0x4
+[ ]*[a-f0-9]+: ff 90 00 00 00 00 call \*0x0\(%rax\) 25: R_X86_64_GOTPCREL foo
+[ ]*[a-f0-9]+: ff 25 00 00 00 00 jmp \*0x0\(%rip\) # 2f <_start\+0x2f> 2b: R_X86_64_GOTPCRELX foo-0x4
+[ ]*[a-f0-9]+: ff a1 00 00 00 00 jmp \*0x0\(%rcx\) 31: R_X86_64_GOTPCREL foo
[ ]*[a-f0-9]+: 48 c7 c0 00 00 00 00 mov \$0x0,%rax 38: R_X86_64_GOTPCREL foo
[ ]*[a-f0-9]+: 48 8b 04 25 00 00 00 00 mov 0x0,%rax 40: R_X86_64_GOTPCREL foo
[ ]*[a-f0-9]+: 48 8b 05 00 00 00 00 mov 0x0\(%rip\),%rax # 4b <_start\+0x4b> 47: R_X86_64_REX_GOTPCRELX foo-0x4
[ ]*[a-f0-9]+: 48 8b 81 00 00 00 00 mov 0x0\(%rcx\),%rax 4e: R_X86_64_GOTPCREL foo
-[ ]*[a-f0-9]+: ff 15 00 00 00 00 callq \*0x0\(%rip\) # 58 <_start\+0x58> 54: R_X86_64_GOTPCRELX foo-0x4
-[ ]*[a-f0-9]+: ff 90 00 00 00 00 callq \*0x0\(%rax\) 5a: R_X86_64_GOTPCREL foo
-[ ]*[a-f0-9]+: ff 25 00 00 00 00 jmpq \*0x0\(%rip\) # 64 <_start\+0x64> 60: R_X86_64_GOTPCRELX foo-0x4
-[ ]*[a-f0-9]+: ff a1 00 00 00 00 jmpq \*0x0\(%rcx\) 66: R_X86_64_GOTPCREL foo
+[ ]*[a-f0-9]+: ff 15 00 00 00 00 call \*0x0\(%rip\) # 58 <_start\+0x58> 54: R_X86_64_GOTPCRELX foo-0x4
+[ ]*[a-f0-9]+: ff 90 00 00 00 00 call \*0x0\(%rax\) 5a: R_X86_64_GOTPCREL foo
+[ ]*[a-f0-9]+: ff 25 00 00 00 00 jmp \*0x0\(%rip\) # 64 <_start\+0x64> 60: R_X86_64_GOTPCRELX foo-0x4
+[ ]*[a-f0-9]+: ff a1 00 00 00 00 jmp \*0x0\(%rcx\) 66: R_X86_64_GOTPCREL foo
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-ifunc.d b/gas/testsuite/gas/i386/x86-64-ifunc.d
index 586c82a5791..39e3ddf9900 100644
--- a/gas/testsuite/gas/i386/x86-64-ifunc.d
+++ b/gas/testsuite/gas/i386/x86-64-ifunc.d
@@ -7,14 +7,14 @@
Disassembly of section .text:
0+ <foo>:
-[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq 5 <ifunc> 1: R_X86_64_PLT32 ifunc(\+0xf+c|-0x4)
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 5 <ifunc> 1: R_X86_64_PLT32 ifunc(\+0xf+c|-0x4)
0+5 <ifunc>:
-[ ]*[a-f0-9]+: c3 retq
+[ ]*[a-f0-9]+: c3 ret *
0+6 <bar>:
[ ]*[a-f0-9]+: eb 00 jmp 8 <normal>
0+8 <normal>:
-[ ]*[a-f0-9]+: c3 retq
+[ ]*[a-f0-9]+: c3 ret *
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-jump.d b/gas/testsuite/gas/i386/x86-64-jump.d
index 1a1521d2782..7d2c994ce26 100644
--- a/gas/testsuite/gas/i386/x86-64-jump.d
+++ b/gas/testsuite/gas/i386/x86-64-jump.d
@@ -9,19 +9,19 @@ Disassembly of section .text:
0+ <.text>:
[ ]*[a-f0-9]+: eb fe jmp (0x0|0 <.text>)
-[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq 0x7 3: R_X86_64_PLT32 xxx-0x4
-[ ]*[a-f0-9]+: ff 24 25 00 00 00 00 jmpq \*0x0 a: R_X86_64_32S xxx
-[ ]*[a-f0-9]+: ff e7 jmpq \*%rdi
-[ ]*[a-f0-9]+: ff 27 jmpq \*\(%rdi\)
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 0x7 3: R_X86_64_PLT32 xxx-0x4
+[ ]*[a-f0-9]+: ff 24 25 00 00 00 00 jmp \*0x0 a: R_X86_64_32S xxx
+[ ]*[a-f0-9]+: ff e7 jmp \*%rdi
+[ ]*[a-f0-9]+: ff 27 jmp \*\(%rdi\)
[ ]*[a-f0-9]+: ff 2c bd 00 00 00 00 ljmp \*0x0\(,%rdi,4\) 15: R_X86_64_32S xxx
[ ]*[a-f0-9]+: 66 ff 2c bd 00 00 00 00 ljmpw \*0x0\(,%rdi,4\) 1d: R_X86_64_32S xxx
[ ]*[a-f0-9]+: ff 2c 25 00 00 00 00 ljmp \*0x0 24: R_X86_64_32S xxx
[ ]*[a-f0-9]+: 66 ff 2c 25 00 00 00 00 ljmpw \*0x0 2c: R_X86_64_32S xxx
-[ ]*[a-f0-9]+: e8 cb ff ff ff callq 0x0
-[ ]*[a-f0-9]+: e8 00 00 00 00 callq 0x3a 36: R_X86_64_PLT32 xxx-0x4
-[ ]*[a-f0-9]+: ff 14 25 00 00 00 00 callq \*0x0 3d: R_X86_64_32S xxx
-[ ]*[a-f0-9]+: ff d7 callq \*%rdi
-[ ]*[a-f0-9]+: ff 17 callq \*\(%rdi\)
+[ ]*[a-f0-9]+: e8 cb ff ff ff call 0x0
+[ ]*[a-f0-9]+: e8 00 00 00 00 call 0x3a 36: R_X86_64_PLT32 xxx-0x4
+[ ]*[a-f0-9]+: ff 14 25 00 00 00 00 call \*0x0 3d: R_X86_64_32S xxx
+[ ]*[a-f0-9]+: ff d7 call \*%rdi
+[ ]*[a-f0-9]+: ff 17 call \*\(%rdi\)
[ ]*[a-f0-9]+: ff 1c bd 00 00 00 00 lcall \*0x0\(,%rdi,4\) 48: R_X86_64_32S xxx
[ ]*[a-f0-9]+: 66 ff 1c bd 00 00 00 00 lcallw \*0x0\(,%rdi,4\) 50: R_X86_64_32S xxx
[ ]*[a-f0-9]+: ff 1c 25 00 00 00 00 lcall \*0x0 57: R_X86_64_32S xxx
@@ -33,14 +33,14 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 66 ff 13 callw \*\(%rbx\)
[ ]*[a-f0-9]+: 66 ff 1b lcallw \*\(%rbx\)
[ ]*[a-f0-9]+: ff 1b lcall \*\(%rbx\)
-[ ]*[a-f0-9]+: ff 13 callq \*\(%rbx\)
-[ ]*[a-f0-9]+: ff 13 callq \*\(%rbx\)
+[ ]*[a-f0-9]+: ff 13 call \*\(%rbx\)
+[ ]*[a-f0-9]+: ff 13 call \*\(%rbx\)
[ ]*[a-f0-9]+: ff 1b lcall \*\(%rbx\)
[ ]*[a-f0-9]+: 66 ff 23 jmpw \*\(%rbx\)
[ ]*[a-f0-9]+: 66 ff 2b ljmpw \*\(%rbx\)
[ ]*[a-f0-9]+: ff 2b ljmp \*\(%rbx\)
-[ ]*[a-f0-9]+: ff 23 jmpq \*\(%rbx\)
-[ ]*[a-f0-9]+: ff 23 jmpq \*\(%rbx\)
+[ ]*[a-f0-9]+: ff 23 jmp \*\(%rbx\)
+[ ]*[a-f0-9]+: ff 23 jmp \*\(%rbx\)
[ ]*[a-f0-9]+: ff 2b ljmp \*\(%rbx\)
[ ]*[a-f0-9]+: eb 00 jmp 0x[0-9a-f]*
[ ]*[a-f0-9]+: 90 nop
diff --git a/gas/testsuite/gas/i386/x86-64-lfence-byte.d b/gas/testsuite/gas/i386/x86-64-lfence-byte.d
index 0083ff61c6c..e84d746f657 100644
--- a/gas/testsuite/gas/i386/x86-64-lfence-byte.d
+++ b/gas/testsuite/gas/i386/x86-64-lfence-byte.d
@@ -12,19 +12,19 @@ Disassembly of section .text:
+[a-f0-9]+: f3 aa rep stos %al,%es:\(%rdi\)
+[a-f0-9]+: 48 83 0c 24 00 orq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: f3 c3 repz retq
- +[a-f0-9]+: f3 c3 repz retq
- +[a-f0-9]+: f3 c3 repz retq
+ +[a-f0-9]+: f3 c3 repz ret *
+ +[a-f0-9]+: f3 c3 repz ret *
+ +[a-f0-9]+: f3 c3 repz ret *
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: ff d0 callq \*%rax
- +[a-f0-9]+: f3 c3 repz retq
+ +[a-f0-9]+: ff d0 call \*%rax
+ +[a-f0-9]+: f3 c3 repz ret *
+[a-f0-9]+: 66 66 c3 data16 retw
- +[a-f0-9]+: f3 c3 repz retq
+ +[a-f0-9]+: f3 c3 repz ret *
+[a-f0-9]+: 9b fwait
+[a-f0-9]+: 48 83 0c 24 00 orq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: f3 c3 repz retq
- +[a-f0-9]+: f3 c3 repz retq
- +[a-f0-9]+: c3 retq
- +[a-f0-9]+: f3 ff d0 repz callq \*%rax
+ +[a-f0-9]+: f3 c3 repz ret *
+ +[a-f0-9]+: f3 c3 repz ret *
+ +[a-f0-9]+: c3 ret *
+ +[a-f0-9]+: f3 ff d0 repz call \*%rax
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-lfence-indbr-a.d b/gas/testsuite/gas/i386/x86-64-lfence-indbr-a.d
index 2ab03b42267..7910f60d8f8 100644
--- a/gas/testsuite/gas/i386/x86-64-lfence-indbr-a.d
+++ b/gas/testsuite/gas/i386/x86-64-lfence-indbr-a.d
@@ -11,11 +11,11 @@ Disassembly of section .text:
0+ <_start>:
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: ff d2 callq \*%rdx
+ +[a-f0-9]+: ff d2 call \*%rdx
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: ff e2 jmpq \*%rdx
- +[a-f0-9]+: ff 12 callq \*\(%rdx\)
- +[a-f0-9]+: ff 22 jmpq \*\(%rdx\)
- +[a-f0-9]+: ff 14 25 00 00 00 00 callq \*0x0
- +[a-f0-9]+: ff 24 25 00 00 00 00 jmpq \*0x0
+ +[a-f0-9]+: ff e2 jmp \*%rdx
+ +[a-f0-9]+: ff 12 call \*\(%rdx\)
+ +[a-f0-9]+: ff 22 jmp \*\(%rdx\)
+ +[a-f0-9]+: ff 14 25 00 00 00 00 call \*0x0
+ +[a-f0-9]+: ff 24 25 00 00 00 00 jmp \*0x0
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-lfence-indbr-b.d b/gas/testsuite/gas/i386/x86-64-lfence-indbr-b.d
index 21abf4d8e4f..5ffdda2a187 100644
--- a/gas/testsuite/gas/i386/x86-64-lfence-indbr-b.d
+++ b/gas/testsuite/gas/i386/x86-64-lfence-indbr-b.d
@@ -10,11 +10,11 @@ Disassembly of section .text:
0+ <_start>:
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: ff d2 callq \*%rdx
+ +[a-f0-9]+: ff d2 call \*%rdx
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: ff e2 jmpq \*%rdx
- +[a-f0-9]+: ff 12 callq \*\(%rdx\)
- +[a-f0-9]+: ff 22 jmpq \*\(%rdx\)
- +[a-f0-9]+: ff 14 25 00 00 00 00 callq \*0x0
- +[a-f0-9]+: ff 24 25 00 00 00 00 jmpq \*0x0
+ +[a-f0-9]+: ff e2 jmp \*%rdx
+ +[a-f0-9]+: ff 12 call \*\(%rdx\)
+ +[a-f0-9]+: ff 22 jmp \*\(%rdx\)
+ +[a-f0-9]+: ff 14 25 00 00 00 00 call \*0x0
+ +[a-f0-9]+: ff 24 25 00 00 00 00 jmp \*0x0
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-lfence-indbr-c.d b/gas/testsuite/gas/i386/x86-64-lfence-indbr-c.d
index 952cff451a2..e794f36bea9 100644
--- a/gas/testsuite/gas/i386/x86-64-lfence-indbr-c.d
+++ b/gas/testsuite/gas/i386/x86-64-lfence-indbr-c.d
@@ -10,10 +10,10 @@
Disassembly of section .text:
0+ <_start>:
- +[a-f0-9]+: ff d2 callq \*%rdx
- +[a-f0-9]+: ff e2 jmpq \*%rdx
- +[a-f0-9]+: ff 12 callq \*\(%rdx\)
- +[a-f0-9]+: ff 22 jmpq \*\(%rdx\)
- +[a-f0-9]+: ff 14 25 00 00 00 00 callq \*0x0
- +[a-f0-9]+: ff 24 25 00 00 00 00 jmpq \*0x0
+ +[a-f0-9]+: ff d2 call \*%rdx
+ +[a-f0-9]+: ff e2 jmp \*%rdx
+ +[a-f0-9]+: ff 12 call \*\(%rdx\)
+ +[a-f0-9]+: ff 22 jmp \*\(%rdx\)
+ +[a-f0-9]+: ff 14 25 00 00 00 00 call \*0x0
+ +[a-f0-9]+: ff 24 25 00 00 00 00 jmp \*0x0
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-lfence-load.d b/gas/testsuite/gas/i386/x86-64-lfence-load.d
index 5cd764391d1..714df8cd5d0 100644
--- a/gas/testsuite/gas/i386/x86-64-lfence-load.d
+++ b/gas/testsuite/gas/i386/x86-64-lfence-load.d
@@ -33,9 +33,9 @@ Disassembly of section .text:
+[a-f0-9]+: 0f 18 55 00 prefetcht1 0x0\(%rbp\)
+[a-f0-9]+: 0f 18 5d 00 prefetcht2 0x0\(%rbp\)
+[a-f0-9]+: 0f 0d 4d 00 prefetchw 0x0\(%rbp\)
- +[a-f0-9]+: 0f a1 popq %fs
+ +[a-f0-9]+: 0f a1 pop %fs
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 9d popfq
+ +[a-f0-9]+: 9d popf *
+[a-f0-9]+: 0f ae e8 lfence
+[a-f0-9]+: d7 xlat %ds:\(%rbx\)
+[a-f0-9]+: 0f ae e8 lfence
@@ -79,7 +79,7 @@ Disassembly of section .text:
+[a-f0-9]+: 0f ae e8 lfence
+[a-f0-9]+: 0f 0f 66 02 b0 pfcmpeq 0x2\(%rsi\),%mm4
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 8f 00 popq \(%rax\)
+ +[a-f0-9]+: 8f 00 pop \(%rax\)
+[a-f0-9]+: 0f ae e8 lfence
+[a-f0-9]+: 58 pop %rax
+[a-f0-9]+: 0f ae e8 lfence
@@ -100,7 +100,7 @@ Disassembly of section .text:
+[a-f0-9]+: f7 29 imull \(%rcx\)
+[a-f0-9]+: 0f ae e8 lfence
+[a-f0-9]+: 48 8d 04 40 lea \(%rax,%rax,2\),%rax
- +[a-f0-9]+: c9 leaveq
+ +[a-f0-9]+: c9 leave *
+[a-f0-9]+: 6e outsb %ds:\(%rsi\),\(%dx\)
+[a-f0-9]+: 0f ae e8 lfence
+[a-f0-9]+: ac lods %ds:\(%rsi\),%al
diff --git a/gas/testsuite/gas/i386/x86-64-lfence-ret-a.d b/gas/testsuite/gas/i386/x86-64-lfence-ret-a.d
index 96881677b63..b74b59c5a5d 100644
--- a/gas/testsuite/gas/i386/x86-64-lfence-ret-a.d
+++ b/gas/testsuite/gas/i386/x86-64-lfence-ret-a.d
@@ -11,20 +11,20 @@ Disassembly of section .text:
0+ <_start>:
+[a-f0-9]+: 48 83 0c 24 00 orq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 c3 data16 retq
+ +[a-f0-9]+: 66 c3 data16 ret *
+[a-f0-9]+: 48 83 0c 24 00 orq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 c2 14 00 data16 retq \$0x14
+ +[a-f0-9]+: 66 c2 14 00 data16 ret \$0x14
+[a-f0-9]+: 48 83 0c 24 00 orq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: c3 retq
+ +[a-f0-9]+: c3 ret *
+[a-f0-9]+: 48 83 0c 24 00 orq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: c2 1e 00 retq \$0x1e
+ +[a-f0-9]+: c2 1e 00 ret \$0x1e
+[a-f0-9]+: 48 83 0c 24 00 orq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 48 c3 data16 rex.W retq
+ +[a-f0-9]+: 66 48 c3 data16 rex\.W ret *
+[a-f0-9]+: 48 83 0c 24 00 orq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 48 c2 28 00 data16 rex.W retq \$0x28
+ +[a-f0-9]+: 66 48 c2 28 00 data16 rex\.W ret \$0x28
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-lfence-ret-b.d b/gas/testsuite/gas/i386/x86-64-lfence-ret-b.d
index 4afad79bc64..1aecd380cdb 100644
--- a/gas/testsuite/gas/i386/x86-64-lfence-ret-b.d
+++ b/gas/testsuite/gas/i386/x86-64-lfence-ret-b.d
@@ -12,25 +12,25 @@ Disassembly of section .text:
+[a-f0-9]+: 48 f7 14 24 notq \(%rsp\)
+[a-f0-9]+: 48 f7 14 24 notq \(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 c3 data16 retq
+ +[a-f0-9]+: 66 c3 data16 ret *
+[a-f0-9]+: 48 f7 14 24 notq \(%rsp\)
+[a-f0-9]+: 48 f7 14 24 notq \(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 c2 14 00 data16 retq \$0x14
+ +[a-f0-9]+: 66 c2 14 00 data16 ret \$0x14
+[a-f0-9]+: 48 f7 14 24 notq \(%rsp\)
+[a-f0-9]+: 48 f7 14 24 notq \(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: c3 retq
+ +[a-f0-9]+: c3 ret *
+[a-f0-9]+: 48 f7 14 24 notq \(%rsp\)
+[a-f0-9]+: 48 f7 14 24 notq \(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: c2 1e 00 retq \$0x1e
+ +[a-f0-9]+: c2 1e 00 ret \$0x1e
+[a-f0-9]+: 48 f7 14 24 notq \(%rsp\)
+[a-f0-9]+: 48 f7 14 24 notq \(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 48 c3 data16 rex.W retq
+ +[a-f0-9]+: 66 48 c3 data16 rex\.W ret *
+[a-f0-9]+: 48 f7 14 24 notq \(%rsp\)
+[a-f0-9]+: 48 f7 14 24 notq \(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 48 c2 28 00 data16 rex.W retq \$0x28
+ +[a-f0-9]+: 66 48 c2 28 00 data16 rex\.W ret \$0x28
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-lfence-ret-c.d b/gas/testsuite/gas/i386/x86-64-lfence-ret-c.d
index 55b0ecb2f02..ca8f2c0355a 100644
--- a/gas/testsuite/gas/i386/x86-64-lfence-ret-c.d
+++ b/gas/testsuite/gas/i386/x86-64-lfence-ret-c.d
@@ -10,20 +10,20 @@ Disassembly of section .text:
0+ <_start>:
+[a-f0-9]+: 48 83 0c 24 00 orq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 c3 data16 retq
+ +[a-f0-9]+: 66 c3 data16 ret *
+[a-f0-9]+: 48 83 0c 24 00 orq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 c2 14 00 data16 retq \$0x14
+ +[a-f0-9]+: 66 c2 14 00 data16 ret \$0x14
+[a-f0-9]+: 48 83 0c 24 00 orq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: c3 retq
+ +[a-f0-9]+: c3 ret *
+[a-f0-9]+: 48 83 0c 24 00 orq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: c2 1e 00 retq \$0x1e
+ +[a-f0-9]+: c2 1e 00 ret \$0x1e
+[a-f0-9]+: 48 83 0c 24 00 orq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 48 c3 data16 rex.W retq
+ +[a-f0-9]+: 66 48 c3 data16 rex\.W ret *
+[a-f0-9]+: 48 83 0c 24 00 orq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 48 c2 28 00 data16 rex.W retq \$0x28
+ +[a-f0-9]+: 66 48 c2 28 00 data16 rex\.W ret \$0x28
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-lfence-ret-d.d b/gas/testsuite/gas/i386/x86-64-lfence-ret-d.d
index efe928aceed..94a18b8d71d 100644
--- a/gas/testsuite/gas/i386/x86-64-lfence-ret-d.d
+++ b/gas/testsuite/gas/i386/x86-64-lfence-ret-d.d
@@ -11,20 +11,20 @@ Disassembly of section .text:
0+ <_start>:
+[a-f0-9]+: 48 c1 24 24 00 shlq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 c3 data16 retq
+ +[a-f0-9]+: 66 c3 data16 ret *
+[a-f0-9]+: 48 c1 24 24 00 shlq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 c2 14 00 data16 retq \$0x14
+ +[a-f0-9]+: 66 c2 14 00 data16 ret \$0x14
+[a-f0-9]+: 48 c1 24 24 00 shlq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: c3 retq
+ +[a-f0-9]+: c3 ret *
+[a-f0-9]+: 48 c1 24 24 00 shlq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: c2 1e 00 retq \$0x1e
+ +[a-f0-9]+: c2 1e 00 ret \$0x1e
+[a-f0-9]+: 48 c1 24 24 00 shlq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 48 c3 data16 rex.W retq
+ +[a-f0-9]+: 66 48 c3 data16 rex\.W ret *
+[a-f0-9]+: 48 c1 24 24 00 shlq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 48 c2 28 00 data16 rex.W retq \$0x28
+ +[a-f0-9]+: 66 48 c2 28 00 data16 rex\.W ret \$0x28
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-lfence-ret-e.d b/gas/testsuite/gas/i386/x86-64-lfence-ret-e.d
index 31286662de6..e52e35c1a36 100644
--- a/gas/testsuite/gas/i386/x86-64-lfence-ret-e.d
+++ b/gas/testsuite/gas/i386/x86-64-lfence-ret-e.d
@@ -11,20 +11,20 @@ Disassembly of section .text:
0+ <_start>:
+[a-f0-9]+: 48 c1 24 24 00 shlq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 c3 data16 retq
+ +[a-f0-9]+: 66 c3 data16 ret *
+[a-f0-9]+: 48 c1 24 24 00 shlq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 c2 14 00 data16 retq \$0x14
+ +[a-f0-9]+: 66 c2 14 00 data16 ret \$0x14
+[a-f0-9]+: 48 c1 24 24 00 shlq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: c3 retq
+ +[a-f0-9]+: c3 ret *
+[a-f0-9]+: 48 c1 24 24 00 shlq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: c2 1e 00 retq \$0x1e
+ +[a-f0-9]+: c2 1e 00 ret \$0x1e
+[a-f0-9]+: 48 c1 24 24 00 shlq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 48 c3 data16 rex.W retq
+ +[a-f0-9]+: 66 48 c3 data16 rex\.W ret *
+[a-f0-9]+: 48 c1 24 24 00 shlq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: 66 48 c2 28 00 data16 rex.W retq \$0x28
+ +[a-f0-9]+: 66 48 c2 28 00 data16 rex\.W ret \$0x28
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-mpx-add-bnd-prefix.d b/gas/testsuite/gas/i386/x86-64-mpx-add-bnd-prefix.d
index fe3e53aa277..6fda4dce752 100644
--- a/gas/testsuite/gas/i386/x86-64-mpx-add-bnd-prefix.d
+++ b/gas/testsuite/gas/i386/x86-64-mpx-add-bnd-prefix.d
@@ -9,19 +9,19 @@
Disassembly of section .text:
0+ <.*>:
-[ ]*[a-f0-9]+: f2 e8 0e 00 00 00 bnd callq 14 <foo>
-[ ]*[a-f0-9]+: f2 ff 10 bnd callq \*\(%rax\)
+[ ]*[a-f0-9]+: f2 e8 0e 00 00 00 bnd call 14 <foo>
+[ ]*[a-f0-9]+: f2 ff 10 bnd call \*\(%rax\)
[ ]*[a-f0-9]+: f2 74 08 bnd je 14 <foo>
[ ]*[a-f0-9]+: f2 eb 05 bnd jmp 14 <foo>
-[ ]*[a-f0-9]+: f2 ff 23 bnd jmpq \*\(%rbx\)
-[ ]*[a-f0-9]+: f2 c3 bnd retq
+[ ]*[a-f0-9]+: f2 ff 23 bnd jmp \*\(%rbx\)
+[ ]*[a-f0-9]+: f2 c3 bnd ret *
0+14 <foo>:
-[ ]*[a-f0-9]+: f2 c3 bnd retq
-[ ]*[a-f0-9]+: f2 c3 bnd retq
-[ ]*[a-f0-9]+: f2 c3 bnd retq
-[ ]*[a-f0-9]+: f2 c3 bnd retq
-[ ]*[a-f0-9]+: f2 e8 f2 ff ff ff bnd callq 14 <foo>
+[ ]*[a-f0-9]+: f2 c3 bnd ret *
+[ ]*[a-f0-9]+: f2 c3 bnd ret *
+[ ]*[a-f0-9]+: f2 c3 bnd ret *
+[ ]*[a-f0-9]+: f2 c3 bnd ret *
+[ ]*[a-f0-9]+: f2 e8 f2 ff ff ff bnd call 14 <foo>
[ ]*[a-f0-9]+: 48 01 c3 add %rax,%rbx
[ ]*[a-f0-9]+: e2 ed loop 14 <foo>
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-mpx-branch-1.d b/gas/testsuite/gas/i386/x86-64-mpx-branch-1.d
index 03e9675217d..795f3fdacc4 100644
--- a/gas/testsuite/gas/i386/x86-64-mpx-branch-1.d
+++ b/gas/testsuite/gas/i386/x86-64-mpx-branch-1.d
@@ -9,23 +9,23 @@
Disassembly of section .text:
0+ <foo1-0x1c>:
-[ ]*[a-f0-9]+: f2 e8 00 00 00 00 bnd callq[...]
[diff truncated at 100000 bytes]
More information about the Binutils-cvs
mailing list