public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] Cleanup mnemonicendp in swap_operand()
@ 2021-12-17 23:26 vladimir.mezentsev
  2021-12-17 23:37 ` H.J. Lu
  0 siblings, 1 reply; 3+ messages in thread
From: vladimir.mezentsev @ 2021-12-17 23:26 UTC (permalink / raw)
  To: binutils

From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>

Tested on x86_64-pc-linux-gnu.

opcodes/ChangeLog:
2021-12-17 Vladimir Mezentsev <vladimir.mezentsev@oracle.com>

	* opcodes/i386-dis.c (swap_operand): Cleanup mnemonicendp

gas/ChangeLog:
2021-12-17 Vladimir Mezentsev <vladimir.mezentsev@oracle.com>

	* gas/testsuite/gas/i386/opts-intel.d: Updated expected disassembly
	* gas/testsuite/gas/i386/opts.d: Likewise.
	* gas/testsuite/gas/i386/sse2avx-opts-intel.d: Likewise.
	* gas/testsuite/gas/i386/sse2avx-opts.d: Likewise.
	* gas/testsuite/gas/i386/x86-64-opts-intel.d: Likewise.
	* gas/testsuite/gas/i386/x86-64-opts.d: Likewise.
	* gas/testsuite/gas/i386/x86-64-sse2avx-opts-intel.d: Likewise.
	* gas/testsuite/gas/i386/x86-64-sse2avx-opts.d: Likewise.
---
 gas/testsuite/gas/i386/opts-intel.d           | 162 ++++++-------
 gas/testsuite/gas/i386/opts.d                 |  18 +-
 gas/testsuite/gas/i386/sse2avx-opts-intel.d   | 162 ++++++-------
 gas/testsuite/gas/i386/sse2avx-opts.d         |  18 +-
 gas/testsuite/gas/i386/x86-64-opts-intel.d    | 216 +++++++++---------
 gas/testsuite/gas/i386/x86-64-opts.d          |  24 +-
 .../gas/i386/x86-64-sse2avx-opts-intel.d      | 216 +++++++++---------
 gas/testsuite/gas/i386/x86-64-sse2avx-opts.d  |  24 +-
 opcodes/i386-dis.c                            |   1 +
 9 files changed, 421 insertions(+), 420 deletions(-)

diff --git a/gas/testsuite/gas/i386/opts-intel.d b/gas/testsuite/gas/i386/opts-intel.d
index 4c546eeda3..4172e93c39 100644
--- a/gas/testsuite/gas/i386/opts-intel.d
+++ b/gas/testsuite/gas/i386/opts-intel.d
@@ -9,113 +9,113 @@ Disassembly of section .text:
 
 0+ <_start>:
 [ 	]*[a-f0-9]+:	00 d1                	add    cl,dl
-[ 	]*[a-f0-9]+:	02 ca                	add.s cl,dl
+[ 	]*[a-f0-9]+:	02 ca                	add.s  cl,dl
 [ 	]*[a-f0-9]+:	66 01 d1             	add    cx,dx
-[ 	]*[a-f0-9]+:	66 03 ca             	add.s cx,dx
+[ 	]*[a-f0-9]+:	66 03 ca             	add.s  cx,dx
 [ 	]*[a-f0-9]+:	01 d1                	add    ecx,edx
-[ 	]*[a-f0-9]+:	03 ca                	add.s ecx,edx
+[ 	]*[a-f0-9]+:	03 ca                	add.s  ecx,edx
 [ 	]*[a-f0-9]+:	00 d1                	add    cl,dl
-[ 	]*[a-f0-9]+:	02 ca                	add.s cl,dl
+[ 	]*[a-f0-9]+:	02 ca                	add.s  cl,dl
 [ 	]*[a-f0-9]+:	66 01 d1             	add    cx,dx
-[ 	]*[a-f0-9]+:	66 03 ca             	add.s cx,dx
+[ 	]*[a-f0-9]+:	66 03 ca             	add.s  cx,dx
 [ 	]*[a-f0-9]+:	01 d1                	add    ecx,edx
-[ 	]*[a-f0-9]+:	03 ca                	add.s ecx,edx
+[ 	]*[a-f0-9]+:	03 ca                	add.s  ecx,edx
 [ 	]*[a-f0-9]+:	10 d1                	adc    cl,dl
-[ 	]*[a-f0-9]+:	12 ca                	adc.s cl,dl
+[ 	]*[a-f0-9]+:	12 ca                	adc.s  cl,dl
 [ 	]*[a-f0-9]+:	66 11 d1             	adc    cx,dx
-[ 	]*[a-f0-9]+:	66 13 ca             	adc.s cx,dx
+[ 	]*[a-f0-9]+:	66 13 ca             	adc.s  cx,dx
 [ 	]*[a-f0-9]+:	11 d1                	adc    ecx,edx
-[ 	]*[a-f0-9]+:	13 ca                	adc.s ecx,edx
+[ 	]*[a-f0-9]+:	13 ca                	adc.s  ecx,edx
 [ 	]*[a-f0-9]+:	10 d1                	adc    cl,dl
-[ 	]*[a-f0-9]+:	12 ca                	adc.s cl,dl
+[ 	]*[a-f0-9]+:	12 ca                	adc.s  cl,dl
 [ 	]*[a-f0-9]+:	66 11 d1             	adc    cx,dx
-[ 	]*[a-f0-9]+:	66 13 ca             	adc.s cx,dx
+[ 	]*[a-f0-9]+:	66 13 ca             	adc.s  cx,dx
 [ 	]*[a-f0-9]+:	11 d1                	adc    ecx,edx
-[ 	]*[a-f0-9]+:	13 ca                	adc.s ecx,edx
+[ 	]*[a-f0-9]+:	13 ca                	adc.s  ecx,edx
 [ 	]*[a-f0-9]+:	20 d1                	and    cl,dl
-[ 	]*[a-f0-9]+:	22 ca                	and.s cl,dl
+[ 	]*[a-f0-9]+:	22 ca                	and.s  cl,dl
 [ 	]*[a-f0-9]+:	66 21 d1             	and    cx,dx
-[ 	]*[a-f0-9]+:	66 23 ca             	and.s cx,dx
+[ 	]*[a-f0-9]+:	66 23 ca             	and.s  cx,dx
 [ 	]*[a-f0-9]+:	21 d1                	and    ecx,edx
-[ 	]*[a-f0-9]+:	23 ca                	and.s ecx,edx
+[ 	]*[a-f0-9]+:	23 ca                	and.s  ecx,edx
 [ 	]*[a-f0-9]+:	20 d1                	and    cl,dl
-[ 	]*[a-f0-9]+:	22 ca                	and.s cl,dl
+[ 	]*[a-f0-9]+:	22 ca                	and.s  cl,dl
 [ 	]*[a-f0-9]+:	66 21 d1             	and    cx,dx
-[ 	]*[a-f0-9]+:	66 23 ca             	and.s cx,dx
+[ 	]*[a-f0-9]+:	66 23 ca             	and.s  cx,dx
 [ 	]*[a-f0-9]+:	21 d1                	and    ecx,edx
-[ 	]*[a-f0-9]+:	23 ca                	and.s ecx,edx
+[ 	]*[a-f0-9]+:	23 ca                	and.s  ecx,edx
 [ 	]*[a-f0-9]+:	38 d1                	cmp    cl,dl
-[ 	]*[a-f0-9]+:	3a ca                	cmp.s cl,dl
+[ 	]*[a-f0-9]+:	3a ca                	cmp.s  cl,dl
 [ 	]*[a-f0-9]+:	66 39 d1             	cmp    cx,dx
-[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s cx,dx
+[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s  cx,dx
 [ 	]*[a-f0-9]+:	39 d1                	cmp    ecx,edx
-[ 	]*[a-f0-9]+:	3b ca                	cmp.s ecx,edx
+[ 	]*[a-f0-9]+:	3b ca                	cmp.s  ecx,edx
 [ 	]*[a-f0-9]+:	38 d1                	cmp    cl,dl
-[ 	]*[a-f0-9]+:	3a ca                	cmp.s cl,dl
+[ 	]*[a-f0-9]+:	3a ca                	cmp.s  cl,dl
 [ 	]*[a-f0-9]+:	66 39 d1             	cmp    cx,dx
-[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s cx,dx
+[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s  cx,dx
 [ 	]*[a-f0-9]+:	39 d1                	cmp    ecx,edx
-[ 	]*[a-f0-9]+:	3b ca                	cmp.s ecx,edx
+[ 	]*[a-f0-9]+:	3b ca                	cmp.s  ecx,edx
 [ 	]*[a-f0-9]+:	88 d1                	mov    cl,dl
-[ 	]*[a-f0-9]+:	8a ca                	mov.s cl,dl
+[ 	]*[a-f0-9]+:	8a ca                	mov.s  cl,dl
 [ 	]*[a-f0-9]+:	66 89 d1             	mov    cx,dx
-[ 	]*[a-f0-9]+:	66 8b ca             	mov.s cx,dx
+[ 	]*[a-f0-9]+:	66 8b ca             	mov.s  cx,dx
 [ 	]*[a-f0-9]+:	89 d1                	mov    ecx,edx
-[ 	]*[a-f0-9]+:	8b ca                	mov.s ecx,edx
+[ 	]*[a-f0-9]+:	8b ca                	mov.s  ecx,edx
 [ 	]*[a-f0-9]+:	88 d1                	mov    cl,dl
-[ 	]*[a-f0-9]+:	8a ca                	mov.s cl,dl
+[ 	]*[a-f0-9]+:	8a ca                	mov.s  cl,dl
 [ 	]*[a-f0-9]+:	66 89 d1             	mov    cx,dx
-[ 	]*[a-f0-9]+:	66 8b ca             	mov.s cx,dx
+[ 	]*[a-f0-9]+:	66 8b ca             	mov.s  cx,dx
 [ 	]*[a-f0-9]+:	89 d1                	mov    ecx,edx
-[ 	]*[a-f0-9]+:	8b ca                	mov.s ecx,edx
+[ 	]*[a-f0-9]+:	8b ca                	mov.s  ecx,edx
 [ 	]*[a-f0-9]+:	08 d1                	or     cl,dl
-[ 	]*[a-f0-9]+:	0a ca                	or.s cl,dl
+[ 	]*[a-f0-9]+:	0a ca                	or.s   cl,dl
 [ 	]*[a-f0-9]+:	66 09 d1             	or     cx,dx
-[ 	]*[a-f0-9]+:	66 0b ca             	or.s cx,dx
+[ 	]*[a-f0-9]+:	66 0b ca             	or.s   cx,dx
 [ 	]*[a-f0-9]+:	09 d1                	or     ecx,edx
-[ 	]*[a-f0-9]+:	0b ca                	or.s ecx,edx
+[ 	]*[a-f0-9]+:	0b ca                	or.s   ecx,edx
 [ 	]*[a-f0-9]+:	08 d1                	or     cl,dl
-[ 	]*[a-f0-9]+:	0a ca                	or.s cl,dl
+[ 	]*[a-f0-9]+:	0a ca                	or.s   cl,dl
 [ 	]*[a-f0-9]+:	66 09 d1             	or     cx,dx
-[ 	]*[a-f0-9]+:	66 0b ca             	or.s cx,dx
+[ 	]*[a-f0-9]+:	66 0b ca             	or.s   cx,dx
 [ 	]*[a-f0-9]+:	09 d1                	or     ecx,edx
-[ 	]*[a-f0-9]+:	0b ca                	or.s ecx,edx
+[ 	]*[a-f0-9]+:	0b ca                	or.s   ecx,edx
 [ 	]*[a-f0-9]+:	18 d1                	sbb    cl,dl
-[ 	]*[a-f0-9]+:	1a ca                	sbb.s cl,dl
+[ 	]*[a-f0-9]+:	1a ca                	sbb.s  cl,dl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbb    cx,dx
-[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s cx,dx
+[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s  cx,dx
 [ 	]*[a-f0-9]+:	19 d1                	sbb    ecx,edx
-[ 	]*[a-f0-9]+:	1b ca                	sbb.s ecx,edx
+[ 	]*[a-f0-9]+:	1b ca                	sbb.s  ecx,edx
 [ 	]*[a-f0-9]+:	18 d1                	sbb    cl,dl
-[ 	]*[a-f0-9]+:	1a ca                	sbb.s cl,dl
+[ 	]*[a-f0-9]+:	1a ca                	sbb.s  cl,dl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbb    cx,dx
-[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s cx,dx
+[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s  cx,dx
 [ 	]*[a-f0-9]+:	19 d1                	sbb    ecx,edx
-[ 	]*[a-f0-9]+:	1b ca                	sbb.s ecx,edx
+[ 	]*[a-f0-9]+:	1b ca                	sbb.s  ecx,edx
 [ 	]*[a-f0-9]+:	28 d1                	sub    cl,dl
-[ 	]*[a-f0-9]+:	2a ca                	sub.s cl,dl
+[ 	]*[a-f0-9]+:	2a ca                	sub.s  cl,dl
 [ 	]*[a-f0-9]+:	66 29 d1             	sub    cx,dx
-[ 	]*[a-f0-9]+:	66 2b ca             	sub.s cx,dx
+[ 	]*[a-f0-9]+:	66 2b ca             	sub.s  cx,dx
 [ 	]*[a-f0-9]+:	29 d1                	sub    ecx,edx
-[ 	]*[a-f0-9]+:	2b ca                	sub.s ecx,edx
+[ 	]*[a-f0-9]+:	2b ca                	sub.s  ecx,edx
 [ 	]*[a-f0-9]+:	28 d1                	sub    cl,dl
-[ 	]*[a-f0-9]+:	2a ca                	sub.s cl,dl
+[ 	]*[a-f0-9]+:	2a ca                	sub.s  cl,dl
 [ 	]*[a-f0-9]+:	66 29 d1             	sub    cx,dx
-[ 	]*[a-f0-9]+:	66 2b ca             	sub.s cx,dx
+[ 	]*[a-f0-9]+:	66 2b ca             	sub.s  cx,dx
 [ 	]*[a-f0-9]+:	29 d1                	sub    ecx,edx
-[ 	]*[a-f0-9]+:	2b ca                	sub.s ecx,edx
+[ 	]*[a-f0-9]+:	2b ca                	sub.s  ecx,edx
 [ 	]*[a-f0-9]+:	30 d1                	xor    cl,dl
-[ 	]*[a-f0-9]+:	32 ca                	xor.s cl,dl
+[ 	]*[a-f0-9]+:	32 ca                	xor.s  cl,dl
 [ 	]*[a-f0-9]+:	66 31 d1             	xor    cx,dx
-[ 	]*[a-f0-9]+:	66 33 ca             	xor.s cx,dx
+[ 	]*[a-f0-9]+:	66 33 ca             	xor.s  cx,dx
 [ 	]*[a-f0-9]+:	31 d1                	xor    ecx,edx
-[ 	]*[a-f0-9]+:	33 ca                	xor.s ecx,edx
+[ 	]*[a-f0-9]+:	33 ca                	xor.s  ecx,edx
 [ 	]*[a-f0-9]+:	30 d1                	xor    cl,dl
-[ 	]*[a-f0-9]+:	32 ca                	xor.s cl,dl
+[ 	]*[a-f0-9]+:	32 ca                	xor.s  cl,dl
 [ 	]*[a-f0-9]+:	66 31 d1             	xor    cx,dx
-[ 	]*[a-f0-9]+:	66 33 ca             	xor.s cx,dx
+[ 	]*[a-f0-9]+:	66 33 ca             	xor.s  cx,dx
 [ 	]*[a-f0-9]+:	31 d1                	xor    ecx,edx
-[ 	]*[a-f0-9]+:	33 ca                	xor.s ecx,edx
+[ 	]*[a-f0-9]+:	33 ca                	xor.s  ecx,edx
 [ 	]*[a-f0-9]+:	c5 fd 28 f4          	vmovapd ymm6,ymm4
 [ 	]*[a-f0-9]+:	c5 fd 29 e6          	vmovapd.s ymm6,ymm4
 [ 	]*[a-f0-9]+:	c5 fc 28 f4          	vmovaps ymm6,ymm4
@@ -169,59 +169,59 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	66 0f 1a d1          	bndmov bnd2,bnd1
 [ 	]*[a-f0-9]+:	66 0f 1b ca          	bndmov.s bnd2,bnd1
 [ 	]*[a-f0-9]+:	00 d1                	add    cl,dl
-[ 	]*[a-f0-9]+:	02 ca                	add.s cl,dl
+[ 	]*[a-f0-9]+:	02 ca                	add.s  cl,dl
 [ 	]*[a-f0-9]+:	66 01 d1             	add    cx,dx
-[ 	]*[a-f0-9]+:	66 03 ca             	add.s cx,dx
+[ 	]*[a-f0-9]+:	66 03 ca             	add.s  cx,dx
 [ 	]*[a-f0-9]+:	01 d1                	add    ecx,edx
-[ 	]*[a-f0-9]+:	03 ca                	add.s ecx,edx
+[ 	]*[a-f0-9]+:	03 ca                	add.s  ecx,edx
 [ 	]*[a-f0-9]+:	10 d1                	adc    cl,dl
-[ 	]*[a-f0-9]+:	12 ca                	adc.s cl,dl
+[ 	]*[a-f0-9]+:	12 ca                	adc.s  cl,dl
 [ 	]*[a-f0-9]+:	66 11 d1             	adc    cx,dx
-[ 	]*[a-f0-9]+:	66 13 ca             	adc.s cx,dx
+[ 	]*[a-f0-9]+:	66 13 ca             	adc.s  cx,dx
 [ 	]*[a-f0-9]+:	11 d1                	adc    ecx,edx
-[ 	]*[a-f0-9]+:	13 ca                	adc.s ecx,edx
+[ 	]*[a-f0-9]+:	13 ca                	adc.s  ecx,edx
 [ 	]*[a-f0-9]+:	20 d1                	and    cl,dl
-[ 	]*[a-f0-9]+:	22 ca                	and.s cl,dl
+[ 	]*[a-f0-9]+:	22 ca                	and.s  cl,dl
 [ 	]*[a-f0-9]+:	66 21 d1             	and    cx,dx
-[ 	]*[a-f0-9]+:	66 23 ca             	and.s cx,dx
+[ 	]*[a-f0-9]+:	66 23 ca             	and.s  cx,dx
 [ 	]*[a-f0-9]+:	21 d1                	and    ecx,edx
-[ 	]*[a-f0-9]+:	23 ca                	and.s ecx,edx
+[ 	]*[a-f0-9]+:	23 ca                	and.s  ecx,edx
 [ 	]*[a-f0-9]+:	38 d1                	cmp    cl,dl
-[ 	]*[a-f0-9]+:	3a ca                	cmp.s cl,dl
+[ 	]*[a-f0-9]+:	3a ca                	cmp.s  cl,dl
 [ 	]*[a-f0-9]+:	66 39 d1             	cmp    cx,dx
-[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s cx,dx
+[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s  cx,dx
 [ 	]*[a-f0-9]+:	39 d1                	cmp    ecx,edx
-[ 	]*[a-f0-9]+:	3b ca                	cmp.s ecx,edx
+[ 	]*[a-f0-9]+:	3b ca                	cmp.s  ecx,edx
 [ 	]*[a-f0-9]+:	88 d1                	mov    cl,dl
-[ 	]*[a-f0-9]+:	8a ca                	mov.s cl,dl
+[ 	]*[a-f0-9]+:	8a ca                	mov.s  cl,dl
 [ 	]*[a-f0-9]+:	66 89 d1             	mov    cx,dx
-[ 	]*[a-f0-9]+:	66 8b ca             	mov.s cx,dx
+[ 	]*[a-f0-9]+:	66 8b ca             	mov.s  cx,dx
 [ 	]*[a-f0-9]+:	89 d1                	mov    ecx,edx
-[ 	]*[a-f0-9]+:	8b ca                	mov.s ecx,edx
+[ 	]*[a-f0-9]+:	8b ca                	mov.s  ecx,edx
 [ 	]*[a-f0-9]+:	08 d1                	or     cl,dl
-[ 	]*[a-f0-9]+:	0a ca                	or.s cl,dl
+[ 	]*[a-f0-9]+:	0a ca                	or.s   cl,dl
 [ 	]*[a-f0-9]+:	66 09 d1             	or     cx,dx
-[ 	]*[a-f0-9]+:	66 0b ca             	or.s cx,dx
+[ 	]*[a-f0-9]+:	66 0b ca             	or.s   cx,dx
 [ 	]*[a-f0-9]+:	09 d1                	or     ecx,edx
-[ 	]*[a-f0-9]+:	0b ca                	or.s ecx,edx
+[ 	]*[a-f0-9]+:	0b ca                	or.s   ecx,edx
 [ 	]*[a-f0-9]+:	18 d1                	sbb    cl,dl
-[ 	]*[a-f0-9]+:	1a ca                	sbb.s cl,dl
+[ 	]*[a-f0-9]+:	1a ca                	sbb.s  cl,dl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbb    cx,dx
-[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s cx,dx
+[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s  cx,dx
 [ 	]*[a-f0-9]+:	19 d1                	sbb    ecx,edx
-[ 	]*[a-f0-9]+:	1b ca                	sbb.s ecx,edx
+[ 	]*[a-f0-9]+:	1b ca                	sbb.s  ecx,edx
 [ 	]*[a-f0-9]+:	28 d1                	sub    cl,dl
-[ 	]*[a-f0-9]+:	2a ca                	sub.s cl,dl
+[ 	]*[a-f0-9]+:	2a ca                	sub.s  cl,dl
 [ 	]*[a-f0-9]+:	66 29 d1             	sub    cx,dx
-[ 	]*[a-f0-9]+:	66 2b ca             	sub.s cx,dx
+[ 	]*[a-f0-9]+:	66 2b ca             	sub.s  cx,dx
 [ 	]*[a-f0-9]+:	29 d1                	sub    ecx,edx
-[ 	]*[a-f0-9]+:	2b ca                	sub.s ecx,edx
+[ 	]*[a-f0-9]+:	2b ca                	sub.s  ecx,edx
 [ 	]*[a-f0-9]+:	30 d1                	xor    cl,dl
-[ 	]*[a-f0-9]+:	32 ca                	xor.s cl,dl
+[ 	]*[a-f0-9]+:	32 ca                	xor.s  cl,dl
 [ 	]*[a-f0-9]+:	66 31 d1             	xor    cx,dx
-[ 	]*[a-f0-9]+:	66 33 ca             	xor.s cx,dx
+[ 	]*[a-f0-9]+:	66 33 ca             	xor.s  cx,dx
 [ 	]*[a-f0-9]+:	31 d1                	xor    ecx,edx
-[ 	]*[a-f0-9]+:	33 ca                	xor.s ecx,edx
+[ 	]*[a-f0-9]+:	33 ca                	xor.s  ecx,edx
 [ 	]*[a-f0-9]+:	c5 fd 28 f4          	vmovapd ymm6,ymm4
 [ 	]*[a-f0-9]+:	c5 fd 29 e6          	vmovapd.s ymm6,ymm4
 [ 	]*[a-f0-9]+:	c5 fc 28 f4          	vmovaps ymm6,ymm4
diff --git a/gas/testsuite/gas/i386/opts.d b/gas/testsuite/gas/i386/opts.d
index af6cdf06cd..73d2a6ef54 100644
--- a/gas/testsuite/gas/i386/opts.d
+++ b/gas/testsuite/gas/i386/opts.d
@@ -68,17 +68,17 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	89 d1                	movl   %edx,%ecx
 [ 	]*[a-f0-9]+:	8b ca                	movl.s %edx,%ecx
 [ 	]*[a-f0-9]+:	08 d1                	orb    %dl,%cl
-[ 	]*[a-f0-9]+:	0a ca                	orb.s %dl,%cl
+[ 	]*[a-f0-9]+:	0a ca                	orb.s  %dl,%cl
 [ 	]*[a-f0-9]+:	66 09 d1             	orw    %dx,%cx
-[ 	]*[a-f0-9]+:	66 0b ca             	orw.s %dx,%cx
+[ 	]*[a-f0-9]+:	66 0b ca             	orw.s  %dx,%cx
 [ 	]*[a-f0-9]+:	09 d1                	orl    %edx,%ecx
-[ 	]*[a-f0-9]+:	0b ca                	orl.s %edx,%ecx
+[ 	]*[a-f0-9]+:	0b ca                	orl.s  %edx,%ecx
 [ 	]*[a-f0-9]+:	08 d1                	orb    %dl,%cl
-[ 	]*[a-f0-9]+:	0a ca                	orb.s %dl,%cl
+[ 	]*[a-f0-9]+:	0a ca                	orb.s  %dl,%cl
 [ 	]*[a-f0-9]+:	66 09 d1             	orw    %dx,%cx
-[ 	]*[a-f0-9]+:	66 0b ca             	orw.s %dx,%cx
+[ 	]*[a-f0-9]+:	66 0b ca             	orw.s  %dx,%cx
 [ 	]*[a-f0-9]+:	09 d1                	orl    %edx,%ecx
-[ 	]*[a-f0-9]+:	0b ca                	orl.s %edx,%ecx
+[ 	]*[a-f0-9]+:	0b ca                	orl.s  %edx,%ecx
 [ 	]*[a-f0-9]+:	18 d1                	sbbb   %dl,%cl
 [ 	]*[a-f0-9]+:	1a ca                	sbbb.s %dl,%cl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbbw   %dx,%cx
@@ -198,11 +198,11 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	89 d1                	movl   %edx,%ecx
 [ 	]*[a-f0-9]+:	8b ca                	movl.s %edx,%ecx
 [ 	]*[a-f0-9]+:	08 d1                	orb    %dl,%cl
-[ 	]*[a-f0-9]+:	0a ca                	orb.s %dl,%cl
+[ 	]*[a-f0-9]+:	0a ca                	orb.s  %dl,%cl
 [ 	]*[a-f0-9]+:	66 09 d1             	orw    %dx,%cx
-[ 	]*[a-f0-9]+:	66 0b ca             	orw.s %dx,%cx
+[ 	]*[a-f0-9]+:	66 0b ca             	orw.s  %dx,%cx
 [ 	]*[a-f0-9]+:	09 d1                	orl    %edx,%ecx
-[ 	]*[a-f0-9]+:	0b ca                	orl.s %edx,%ecx
+[ 	]*[a-f0-9]+:	0b ca                	orl.s  %edx,%ecx
 [ 	]*[a-f0-9]+:	18 d1                	sbbb   %dl,%cl
 [ 	]*[a-f0-9]+:	1a ca                	sbbb.s %dl,%cl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbbw   %dx,%cx
diff --git a/gas/testsuite/gas/i386/sse2avx-opts-intel.d b/gas/testsuite/gas/i386/sse2avx-opts-intel.d
index 3e48cf83a4..6f9d30dabe 100644
--- a/gas/testsuite/gas/i386/sse2avx-opts-intel.d
+++ b/gas/testsuite/gas/i386/sse2avx-opts-intel.d
@@ -10,113 +10,113 @@ Disassembly of section .text:
 
 0+ <_start>:
 [ 	]*[a-f0-9]+:	00 d1                	add    cl,dl
-[ 	]*[a-f0-9]+:	02 ca                	add.s cl,dl
+[ 	]*[a-f0-9]+:	02 ca                	add.s  cl,dl
 [ 	]*[a-f0-9]+:	66 01 d1             	add    cx,dx
-[ 	]*[a-f0-9]+:	66 03 ca             	add.s cx,dx
+[ 	]*[a-f0-9]+:	66 03 ca             	add.s  cx,dx
 [ 	]*[a-f0-9]+:	01 d1                	add    ecx,edx
-[ 	]*[a-f0-9]+:	03 ca                	add.s ecx,edx
+[ 	]*[a-f0-9]+:	03 ca                	add.s  ecx,edx
 [ 	]*[a-f0-9]+:	00 d1                	add    cl,dl
-[ 	]*[a-f0-9]+:	02 ca                	add.s cl,dl
+[ 	]*[a-f0-9]+:	02 ca                	add.s  cl,dl
 [ 	]*[a-f0-9]+:	66 01 d1             	add    cx,dx
-[ 	]*[a-f0-9]+:	66 03 ca             	add.s cx,dx
+[ 	]*[a-f0-9]+:	66 03 ca             	add.s  cx,dx
 [ 	]*[a-f0-9]+:	01 d1                	add    ecx,edx
-[ 	]*[a-f0-9]+:	03 ca                	add.s ecx,edx
+[ 	]*[a-f0-9]+:	03 ca                	add.s  ecx,edx
 [ 	]*[a-f0-9]+:	10 d1                	adc    cl,dl
-[ 	]*[a-f0-9]+:	12 ca                	adc.s cl,dl
+[ 	]*[a-f0-9]+:	12 ca                	adc.s  cl,dl
 [ 	]*[a-f0-9]+:	66 11 d1             	adc    cx,dx
-[ 	]*[a-f0-9]+:	66 13 ca             	adc.s cx,dx
+[ 	]*[a-f0-9]+:	66 13 ca             	adc.s  cx,dx
 [ 	]*[a-f0-9]+:	11 d1                	adc    ecx,edx
-[ 	]*[a-f0-9]+:	13 ca                	adc.s ecx,edx
+[ 	]*[a-f0-9]+:	13 ca                	adc.s  ecx,edx
 [ 	]*[a-f0-9]+:	10 d1                	adc    cl,dl
-[ 	]*[a-f0-9]+:	12 ca                	adc.s cl,dl
+[ 	]*[a-f0-9]+:	12 ca                	adc.s  cl,dl
 [ 	]*[a-f0-9]+:	66 11 d1             	adc    cx,dx
-[ 	]*[a-f0-9]+:	66 13 ca             	adc.s cx,dx
+[ 	]*[a-f0-9]+:	66 13 ca             	adc.s  cx,dx
 [ 	]*[a-f0-9]+:	11 d1                	adc    ecx,edx
-[ 	]*[a-f0-9]+:	13 ca                	adc.s ecx,edx
+[ 	]*[a-f0-9]+:	13 ca                	adc.s  ecx,edx
 [ 	]*[a-f0-9]+:	20 d1                	and    cl,dl
-[ 	]*[a-f0-9]+:	22 ca                	and.s cl,dl
+[ 	]*[a-f0-9]+:	22 ca                	and.s  cl,dl
 [ 	]*[a-f0-9]+:	66 21 d1             	and    cx,dx
-[ 	]*[a-f0-9]+:	66 23 ca             	and.s cx,dx
+[ 	]*[a-f0-9]+:	66 23 ca             	and.s  cx,dx
 [ 	]*[a-f0-9]+:	21 d1                	and    ecx,edx
-[ 	]*[a-f0-9]+:	23 ca                	and.s ecx,edx
+[ 	]*[a-f0-9]+:	23 ca                	and.s  ecx,edx
 [ 	]*[a-f0-9]+:	20 d1                	and    cl,dl
-[ 	]*[a-f0-9]+:	22 ca                	and.s cl,dl
+[ 	]*[a-f0-9]+:	22 ca                	and.s  cl,dl
 [ 	]*[a-f0-9]+:	66 21 d1             	and    cx,dx
-[ 	]*[a-f0-9]+:	66 23 ca             	and.s cx,dx
+[ 	]*[a-f0-9]+:	66 23 ca             	and.s  cx,dx
 [ 	]*[a-f0-9]+:	21 d1                	and    ecx,edx
-[ 	]*[a-f0-9]+:	23 ca                	and.s ecx,edx
+[ 	]*[a-f0-9]+:	23 ca                	and.s  ecx,edx
 [ 	]*[a-f0-9]+:	38 d1                	cmp    cl,dl
-[ 	]*[a-f0-9]+:	3a ca                	cmp.s cl,dl
+[ 	]*[a-f0-9]+:	3a ca                	cmp.s  cl,dl
 [ 	]*[a-f0-9]+:	66 39 d1             	cmp    cx,dx
-[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s cx,dx
+[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s  cx,dx
 [ 	]*[a-f0-9]+:	39 d1                	cmp    ecx,edx
-[ 	]*[a-f0-9]+:	3b ca                	cmp.s ecx,edx
+[ 	]*[a-f0-9]+:	3b ca                	cmp.s  ecx,edx
 [ 	]*[a-f0-9]+:	38 d1                	cmp    cl,dl
-[ 	]*[a-f0-9]+:	3a ca                	cmp.s cl,dl
+[ 	]*[a-f0-9]+:	3a ca                	cmp.s  cl,dl
 [ 	]*[a-f0-9]+:	66 39 d1             	cmp    cx,dx
-[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s cx,dx
+[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s  cx,dx
 [ 	]*[a-f0-9]+:	39 d1                	cmp    ecx,edx
-[ 	]*[a-f0-9]+:	3b ca                	cmp.s ecx,edx
+[ 	]*[a-f0-9]+:	3b ca                	cmp.s  ecx,edx
 [ 	]*[a-f0-9]+:	88 d1                	mov    cl,dl
-[ 	]*[a-f0-9]+:	8a ca                	mov.s cl,dl
+[ 	]*[a-f0-9]+:	8a ca                	mov.s  cl,dl
 [ 	]*[a-f0-9]+:	66 89 d1             	mov    cx,dx
-[ 	]*[a-f0-9]+:	66 8b ca             	mov.s cx,dx
+[ 	]*[a-f0-9]+:	66 8b ca             	mov.s  cx,dx
 [ 	]*[a-f0-9]+:	89 d1                	mov    ecx,edx
-[ 	]*[a-f0-9]+:	8b ca                	mov.s ecx,edx
+[ 	]*[a-f0-9]+:	8b ca                	mov.s  ecx,edx
 [ 	]*[a-f0-9]+:	88 d1                	mov    cl,dl
-[ 	]*[a-f0-9]+:	8a ca                	mov.s cl,dl
+[ 	]*[a-f0-9]+:	8a ca                	mov.s  cl,dl
 [ 	]*[a-f0-9]+:	66 89 d1             	mov    cx,dx
-[ 	]*[a-f0-9]+:	66 8b ca             	mov.s cx,dx
+[ 	]*[a-f0-9]+:	66 8b ca             	mov.s  cx,dx
 [ 	]*[a-f0-9]+:	89 d1                	mov    ecx,edx
-[ 	]*[a-f0-9]+:	8b ca                	mov.s ecx,edx
+[ 	]*[a-f0-9]+:	8b ca                	mov.s  ecx,edx
 [ 	]*[a-f0-9]+:	08 d1                	or     cl,dl
-[ 	]*[a-f0-9]+:	0a ca                	or.s cl,dl
+[ 	]*[a-f0-9]+:	0a ca                	or.s   cl,dl
 [ 	]*[a-f0-9]+:	66 09 d1             	or     cx,dx
-[ 	]*[a-f0-9]+:	66 0b ca             	or.s cx,dx
+[ 	]*[a-f0-9]+:	66 0b ca             	or.s   cx,dx
 [ 	]*[a-f0-9]+:	09 d1                	or     ecx,edx
-[ 	]*[a-f0-9]+:	0b ca                	or.s ecx,edx
+[ 	]*[a-f0-9]+:	0b ca                	or.s   ecx,edx
 [ 	]*[a-f0-9]+:	08 d1                	or     cl,dl
-[ 	]*[a-f0-9]+:	0a ca                	or.s cl,dl
+[ 	]*[a-f0-9]+:	0a ca                	or.s   cl,dl
 [ 	]*[a-f0-9]+:	66 09 d1             	or     cx,dx
-[ 	]*[a-f0-9]+:	66 0b ca             	or.s cx,dx
+[ 	]*[a-f0-9]+:	66 0b ca             	or.s   cx,dx
 [ 	]*[a-f0-9]+:	09 d1                	or     ecx,edx
-[ 	]*[a-f0-9]+:	0b ca                	or.s ecx,edx
+[ 	]*[a-f0-9]+:	0b ca                	or.s   ecx,edx
 [ 	]*[a-f0-9]+:	18 d1                	sbb    cl,dl
-[ 	]*[a-f0-9]+:	1a ca                	sbb.s cl,dl
+[ 	]*[a-f0-9]+:	1a ca                	sbb.s  cl,dl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbb    cx,dx
-[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s cx,dx
+[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s  cx,dx
 [ 	]*[a-f0-9]+:	19 d1                	sbb    ecx,edx
-[ 	]*[a-f0-9]+:	1b ca                	sbb.s ecx,edx
+[ 	]*[a-f0-9]+:	1b ca                	sbb.s  ecx,edx
 [ 	]*[a-f0-9]+:	18 d1                	sbb    cl,dl
-[ 	]*[a-f0-9]+:	1a ca                	sbb.s cl,dl
+[ 	]*[a-f0-9]+:	1a ca                	sbb.s  cl,dl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbb    cx,dx
-[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s cx,dx
+[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s  cx,dx
 [ 	]*[a-f0-9]+:	19 d1                	sbb    ecx,edx
-[ 	]*[a-f0-9]+:	1b ca                	sbb.s ecx,edx
+[ 	]*[a-f0-9]+:	1b ca                	sbb.s  ecx,edx
 [ 	]*[a-f0-9]+:	28 d1                	sub    cl,dl
-[ 	]*[a-f0-9]+:	2a ca                	sub.s cl,dl
+[ 	]*[a-f0-9]+:	2a ca                	sub.s  cl,dl
 [ 	]*[a-f0-9]+:	66 29 d1             	sub    cx,dx
-[ 	]*[a-f0-9]+:	66 2b ca             	sub.s cx,dx
+[ 	]*[a-f0-9]+:	66 2b ca             	sub.s  cx,dx
 [ 	]*[a-f0-9]+:	29 d1                	sub    ecx,edx
-[ 	]*[a-f0-9]+:	2b ca                	sub.s ecx,edx
+[ 	]*[a-f0-9]+:	2b ca                	sub.s  ecx,edx
 [ 	]*[a-f0-9]+:	28 d1                	sub    cl,dl
-[ 	]*[a-f0-9]+:	2a ca                	sub.s cl,dl
+[ 	]*[a-f0-9]+:	2a ca                	sub.s  cl,dl
 [ 	]*[a-f0-9]+:	66 29 d1             	sub    cx,dx
-[ 	]*[a-f0-9]+:	66 2b ca             	sub.s cx,dx
+[ 	]*[a-f0-9]+:	66 2b ca             	sub.s  cx,dx
 [ 	]*[a-f0-9]+:	29 d1                	sub    ecx,edx
-[ 	]*[a-f0-9]+:	2b ca                	sub.s ecx,edx
+[ 	]*[a-f0-9]+:	2b ca                	sub.s  ecx,edx
 [ 	]*[a-f0-9]+:	30 d1                	xor    cl,dl
-[ 	]*[a-f0-9]+:	32 ca                	xor.s cl,dl
+[ 	]*[a-f0-9]+:	32 ca                	xor.s  cl,dl
 [ 	]*[a-f0-9]+:	66 31 d1             	xor    cx,dx
-[ 	]*[a-f0-9]+:	66 33 ca             	xor.s cx,dx
+[ 	]*[a-f0-9]+:	66 33 ca             	xor.s  cx,dx
 [ 	]*[a-f0-9]+:	31 d1                	xor    ecx,edx
-[ 	]*[a-f0-9]+:	33 ca                	xor.s ecx,edx
+[ 	]*[a-f0-9]+:	33 ca                	xor.s  ecx,edx
 [ 	]*[a-f0-9]+:	30 d1                	xor    cl,dl
-[ 	]*[a-f0-9]+:	32 ca                	xor.s cl,dl
+[ 	]*[a-f0-9]+:	32 ca                	xor.s  cl,dl
 [ 	]*[a-f0-9]+:	66 31 d1             	xor    cx,dx
-[ 	]*[a-f0-9]+:	66 33 ca             	xor.s cx,dx
+[ 	]*[a-f0-9]+:	66 33 ca             	xor.s  cx,dx
 [ 	]*[a-f0-9]+:	31 d1                	xor    ecx,edx
-[ 	]*[a-f0-9]+:	33 ca                	xor.s ecx,edx
+[ 	]*[a-f0-9]+:	33 ca                	xor.s  ecx,edx
 [ 	]*[a-f0-9]+:	c5 fd 28 f4          	vmovapd ymm6,ymm4
 [ 	]*[a-f0-9]+:	c5 fd 29 e6          	vmovapd.s ymm6,ymm4
 [ 	]*[a-f0-9]+:	c5 fc 28 f4          	vmovaps ymm6,ymm4
@@ -170,59 +170,59 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	66 0f 1a d1          	bndmov bnd2,bnd1
 [ 	]*[a-f0-9]+:	66 0f 1b ca          	bndmov.s bnd2,bnd1
 [ 	]*[a-f0-9]+:	00 d1                	add    cl,dl
-[ 	]*[a-f0-9]+:	02 ca                	add.s cl,dl
+[ 	]*[a-f0-9]+:	02 ca                	add.s  cl,dl
 [ 	]*[a-f0-9]+:	66 01 d1             	add    cx,dx
-[ 	]*[a-f0-9]+:	66 03 ca             	add.s cx,dx
+[ 	]*[a-f0-9]+:	66 03 ca             	add.s  cx,dx
 [ 	]*[a-f0-9]+:	01 d1                	add    ecx,edx
-[ 	]*[a-f0-9]+:	03 ca                	add.s ecx,edx
+[ 	]*[a-f0-9]+:	03 ca                	add.s  ecx,edx
 [ 	]*[a-f0-9]+:	10 d1                	adc    cl,dl
-[ 	]*[a-f0-9]+:	12 ca                	adc.s cl,dl
+[ 	]*[a-f0-9]+:	12 ca                	adc.s  cl,dl
 [ 	]*[a-f0-9]+:	66 11 d1             	adc    cx,dx
-[ 	]*[a-f0-9]+:	66 13 ca             	adc.s cx,dx
+[ 	]*[a-f0-9]+:	66 13 ca             	adc.s  cx,dx
 [ 	]*[a-f0-9]+:	11 d1                	adc    ecx,edx
-[ 	]*[a-f0-9]+:	13 ca                	adc.s ecx,edx
+[ 	]*[a-f0-9]+:	13 ca                	adc.s  ecx,edx
 [ 	]*[a-f0-9]+:	20 d1                	and    cl,dl
-[ 	]*[a-f0-9]+:	22 ca                	and.s cl,dl
+[ 	]*[a-f0-9]+:	22 ca                	and.s  cl,dl
 [ 	]*[a-f0-9]+:	66 21 d1             	and    cx,dx
-[ 	]*[a-f0-9]+:	66 23 ca             	and.s cx,dx
+[ 	]*[a-f0-9]+:	66 23 ca             	and.s  cx,dx
 [ 	]*[a-f0-9]+:	21 d1                	and    ecx,edx
-[ 	]*[a-f0-9]+:	23 ca                	and.s ecx,edx
+[ 	]*[a-f0-9]+:	23 ca                	and.s  ecx,edx
 [ 	]*[a-f0-9]+:	38 d1                	cmp    cl,dl
-[ 	]*[a-f0-9]+:	3a ca                	cmp.s cl,dl
+[ 	]*[a-f0-9]+:	3a ca                	cmp.s  cl,dl
 [ 	]*[a-f0-9]+:	66 39 d1             	cmp    cx,dx
-[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s cx,dx
+[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s  cx,dx
 [ 	]*[a-f0-9]+:	39 d1                	cmp    ecx,edx
-[ 	]*[a-f0-9]+:	3b ca                	cmp.s ecx,edx
+[ 	]*[a-f0-9]+:	3b ca                	cmp.s  ecx,edx
 [ 	]*[a-f0-9]+:	88 d1                	mov    cl,dl
-[ 	]*[a-f0-9]+:	8a ca                	mov.s cl,dl
+[ 	]*[a-f0-9]+:	8a ca                	mov.s  cl,dl
 [ 	]*[a-f0-9]+:	66 89 d1             	mov    cx,dx
-[ 	]*[a-f0-9]+:	66 8b ca             	mov.s cx,dx
+[ 	]*[a-f0-9]+:	66 8b ca             	mov.s  cx,dx
 [ 	]*[a-f0-9]+:	89 d1                	mov    ecx,edx
-[ 	]*[a-f0-9]+:	8b ca                	mov.s ecx,edx
+[ 	]*[a-f0-9]+:	8b ca                	mov.s  ecx,edx
 [ 	]*[a-f0-9]+:	08 d1                	or     cl,dl
-[ 	]*[a-f0-9]+:	0a ca                	or.s cl,dl
+[ 	]*[a-f0-9]+:	0a ca                	or.s   cl,dl
 [ 	]*[a-f0-9]+:	66 09 d1             	or     cx,dx
-[ 	]*[a-f0-9]+:	66 0b ca             	or.s cx,dx
+[ 	]*[a-f0-9]+:	66 0b ca             	or.s   cx,dx
 [ 	]*[a-f0-9]+:	09 d1                	or     ecx,edx
-[ 	]*[a-f0-9]+:	0b ca                	or.s ecx,edx
+[ 	]*[a-f0-9]+:	0b ca                	or.s   ecx,edx
 [ 	]*[a-f0-9]+:	18 d1                	sbb    cl,dl
-[ 	]*[a-f0-9]+:	1a ca                	sbb.s cl,dl
+[ 	]*[a-f0-9]+:	1a ca                	sbb.s  cl,dl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbb    cx,dx
-[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s cx,dx
+[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s  cx,dx
 [ 	]*[a-f0-9]+:	19 d1                	sbb    ecx,edx
-[ 	]*[a-f0-9]+:	1b ca                	sbb.s ecx,edx
+[ 	]*[a-f0-9]+:	1b ca                	sbb.s  ecx,edx
 [ 	]*[a-f0-9]+:	28 d1                	sub    cl,dl
-[ 	]*[a-f0-9]+:	2a ca                	sub.s cl,dl
+[ 	]*[a-f0-9]+:	2a ca                	sub.s  cl,dl
 [ 	]*[a-f0-9]+:	66 29 d1             	sub    cx,dx
-[ 	]*[a-f0-9]+:	66 2b ca             	sub.s cx,dx
+[ 	]*[a-f0-9]+:	66 2b ca             	sub.s  cx,dx
 [ 	]*[a-f0-9]+:	29 d1                	sub    ecx,edx
-[ 	]*[a-f0-9]+:	2b ca                	sub.s ecx,edx
+[ 	]*[a-f0-9]+:	2b ca                	sub.s  ecx,edx
 [ 	]*[a-f0-9]+:	30 d1                	xor    cl,dl
-[ 	]*[a-f0-9]+:	32 ca                	xor.s cl,dl
+[ 	]*[a-f0-9]+:	32 ca                	xor.s  cl,dl
 [ 	]*[a-f0-9]+:	66 31 d1             	xor    cx,dx
-[ 	]*[a-f0-9]+:	66 33 ca             	xor.s cx,dx
+[ 	]*[a-f0-9]+:	66 33 ca             	xor.s  cx,dx
 [ 	]*[a-f0-9]+:	31 d1                	xor    ecx,edx
-[ 	]*[a-f0-9]+:	33 ca                	xor.s ecx,edx
+[ 	]*[a-f0-9]+:	33 ca                	xor.s  ecx,edx
 [ 	]*[a-f0-9]+:	c5 fd 28 f4          	vmovapd ymm6,ymm4
 [ 	]*[a-f0-9]+:	c5 fd 29 e6          	vmovapd.s ymm6,ymm4
 [ 	]*[a-f0-9]+:	c5 fc 28 f4          	vmovaps ymm6,ymm4
diff --git a/gas/testsuite/gas/i386/sse2avx-opts.d b/gas/testsuite/gas/i386/sse2avx-opts.d
index c0524b78aa..48e0933474 100644
--- a/gas/testsuite/gas/i386/sse2avx-opts.d
+++ b/gas/testsuite/gas/i386/sse2avx-opts.d
@@ -70,17 +70,17 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	89 d1                	movl   %edx,%ecx
 [ 	]*[a-f0-9]+:	8b ca                	movl.s %edx,%ecx
 [ 	]*[a-f0-9]+:	08 d1                	orb    %dl,%cl
-[ 	]*[a-f0-9]+:	0a ca                	orb.s %dl,%cl
+[ 	]*[a-f0-9]+:	0a ca                	orb.s  %dl,%cl
 [ 	]*[a-f0-9]+:	66 09 d1             	orw    %dx,%cx
-[ 	]*[a-f0-9]+:	66 0b ca             	orw.s %dx,%cx
+[ 	]*[a-f0-9]+:	66 0b ca             	orw.s  %dx,%cx
 [ 	]*[a-f0-9]+:	09 d1                	orl    %edx,%ecx
-[ 	]*[a-f0-9]+:	0b ca                	orl.s %edx,%ecx
+[ 	]*[a-f0-9]+:	0b ca                	orl.s  %edx,%ecx
 [ 	]*[a-f0-9]+:	08 d1                	orb    %dl,%cl
-[ 	]*[a-f0-9]+:	0a ca                	orb.s %dl,%cl
+[ 	]*[a-f0-9]+:	0a ca                	orb.s  %dl,%cl
 [ 	]*[a-f0-9]+:	66 09 d1             	orw    %dx,%cx
-[ 	]*[a-f0-9]+:	66 0b ca             	orw.s %dx,%cx
+[ 	]*[a-f0-9]+:	66 0b ca             	orw.s  %dx,%cx
 [ 	]*[a-f0-9]+:	09 d1                	orl    %edx,%ecx
-[ 	]*[a-f0-9]+:	0b ca                	orl.s %edx,%ecx
+[ 	]*[a-f0-9]+:	0b ca                	orl.s  %edx,%ecx
 [ 	]*[a-f0-9]+:	18 d1                	sbbb   %dl,%cl
 [ 	]*[a-f0-9]+:	1a ca                	sbbb.s %dl,%cl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbbw   %dx,%cx
@@ -200,11 +200,11 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	89 d1                	movl   %edx,%ecx
 [ 	]*[a-f0-9]+:	8b ca                	movl.s %edx,%ecx
 [ 	]*[a-f0-9]+:	08 d1                	orb    %dl,%cl
-[ 	]*[a-f0-9]+:	0a ca                	orb.s %dl,%cl
+[ 	]*[a-f0-9]+:	0a ca                	orb.s  %dl,%cl
 [ 	]*[a-f0-9]+:	66 09 d1             	orw    %dx,%cx
-[ 	]*[a-f0-9]+:	66 0b ca             	orw.s %dx,%cx
+[ 	]*[a-f0-9]+:	66 0b ca             	orw.s  %dx,%cx
 [ 	]*[a-f0-9]+:	09 d1                	orl    %edx,%ecx
-[ 	]*[a-f0-9]+:	0b ca                	orl.s %edx,%ecx
+[ 	]*[a-f0-9]+:	0b ca                	orl.s  %edx,%ecx
 [ 	]*[a-f0-9]+:	18 d1                	sbbb   %dl,%cl
 [ 	]*[a-f0-9]+:	1a ca                	sbbb.s %dl,%cl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbbw   %dx,%cx
diff --git a/gas/testsuite/gas/i386/x86-64-opts-intel.d b/gas/testsuite/gas/i386/x86-64-opts-intel.d
index 5423b72d07..9769aec65f 100644
--- a/gas/testsuite/gas/i386/x86-64-opts-intel.d
+++ b/gas/testsuite/gas/i386/x86-64-opts-intel.d
@@ -9,149 +9,149 @@ Disassembly of section .text:
 
 0+ <_start>:
 [ 	]*[a-f0-9]+:	00 d1                	add    cl,dl
-[ 	]*[a-f0-9]+:	02 ca                	add.s cl,dl
+[ 	]*[a-f0-9]+:	02 ca                	add.s  cl,dl
 [ 	]*[a-f0-9]+:	66 01 d1             	add    cx,dx
-[ 	]*[a-f0-9]+:	66 03 ca             	add.s cx,dx
+[ 	]*[a-f0-9]+:	66 03 ca             	add.s  cx,dx
 [ 	]*[a-f0-9]+:	01 d1                	add    ecx,edx
-[ 	]*[a-f0-9]+:	03 ca                	add.s ecx,edx
+[ 	]*[a-f0-9]+:	03 ca                	add.s  ecx,edx
 [ 	]*[a-f0-9]+:	00 d1                	add    cl,dl
-[ 	]*[a-f0-9]+:	02 ca                	add.s cl,dl
+[ 	]*[a-f0-9]+:	02 ca                	add.s  cl,dl
 [ 	]*[a-f0-9]+:	66 01 d1             	add    cx,dx
-[ 	]*[a-f0-9]+:	66 03 ca             	add.s cx,dx
+[ 	]*[a-f0-9]+:	66 03 ca             	add.s  cx,dx
 [ 	]*[a-f0-9]+:	01 d1                	add    ecx,edx
-[ 	]*[a-f0-9]+:	03 ca                	add.s ecx,edx
+[ 	]*[a-f0-9]+:	03 ca                	add.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 01 d1             	add    rcx,rdx
-[ 	]*[a-f0-9]+:	48 03 ca             	add.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 03 ca             	add.s  rcx,rdx
 [ 	]*[a-f0-9]+:	48 01 d1             	add    rcx,rdx
-[ 	]*[a-f0-9]+:	48 03 ca             	add.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 03 ca             	add.s  rcx,rdx
 [ 	]*[a-f0-9]+:	10 d1                	adc    cl,dl
-[ 	]*[a-f0-9]+:	12 ca                	adc.s cl,dl
+[ 	]*[a-f0-9]+:	12 ca                	adc.s  cl,dl
 [ 	]*[a-f0-9]+:	66 11 d1             	adc    cx,dx
-[ 	]*[a-f0-9]+:	66 13 ca             	adc.s cx,dx
+[ 	]*[a-f0-9]+:	66 13 ca             	adc.s  cx,dx
 [ 	]*[a-f0-9]+:	11 d1                	adc    ecx,edx
-[ 	]*[a-f0-9]+:	13 ca                	adc.s ecx,edx
+[ 	]*[a-f0-9]+:	13 ca                	adc.s  ecx,edx
 [ 	]*[a-f0-9]+:	10 d1                	adc    cl,dl
-[ 	]*[a-f0-9]+:	12 ca                	adc.s cl,dl
+[ 	]*[a-f0-9]+:	12 ca                	adc.s  cl,dl
 [ 	]*[a-f0-9]+:	66 11 d1             	adc    cx,dx
-[ 	]*[a-f0-9]+:	66 13 ca             	adc.s cx,dx
+[ 	]*[a-f0-9]+:	66 13 ca             	adc.s  cx,dx
 [ 	]*[a-f0-9]+:	11 d1                	adc    ecx,edx
-[ 	]*[a-f0-9]+:	13 ca                	adc.s ecx,edx
+[ 	]*[a-f0-9]+:	13 ca                	adc.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 11 d1             	adc    rcx,rdx
-[ 	]*[a-f0-9]+:	48 13 ca             	adc.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 13 ca             	adc.s  rcx,rdx
 [ 	]*[a-f0-9]+:	48 11 d1             	adc    rcx,rdx
-[ 	]*[a-f0-9]+:	48 13 ca             	adc.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 13 ca             	adc.s  rcx,rdx
 [ 	]*[a-f0-9]+:	20 d1                	and    cl,dl
-[ 	]*[a-f0-9]+:	22 ca                	and.s cl,dl
+[ 	]*[a-f0-9]+:	22 ca                	and.s  cl,dl
 [ 	]*[a-f0-9]+:	66 21 d1             	and    cx,dx
-[ 	]*[a-f0-9]+:	66 23 ca             	and.s cx,dx
+[ 	]*[a-f0-9]+:	66 23 ca             	and.s  cx,dx
 [ 	]*[a-f0-9]+:	21 d1                	and    ecx,edx
-[ 	]*[a-f0-9]+:	23 ca                	and.s ecx,edx
+[ 	]*[a-f0-9]+:	23 ca                	and.s  ecx,edx
 [ 	]*[a-f0-9]+:	20 d1                	and    cl,dl
-[ 	]*[a-f0-9]+:	22 ca                	and.s cl,dl
+[ 	]*[a-f0-9]+:	22 ca                	and.s  cl,dl
 [ 	]*[a-f0-9]+:	66 21 d1             	and    cx,dx
-[ 	]*[a-f0-9]+:	66 23 ca             	and.s cx,dx
+[ 	]*[a-f0-9]+:	66 23 ca             	and.s  cx,dx
 [ 	]*[a-f0-9]+:	21 d1                	and    ecx,edx
-[ 	]*[a-f0-9]+:	23 ca                	and.s ecx,edx
+[ 	]*[a-f0-9]+:	23 ca                	and.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 21 d1             	and    rcx,rdx
-[ 	]*[a-f0-9]+:	48 23 ca             	and.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 23 ca             	and.s  rcx,rdx
 [ 	]*[a-f0-9]+:	48 21 d1             	and    rcx,rdx
-[ 	]*[a-f0-9]+:	48 23 ca             	and.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 23 ca             	and.s  rcx,rdx
 [ 	]*[a-f0-9]+:	38 d1                	cmp    cl,dl
-[ 	]*[a-f0-9]+:	3a ca                	cmp.s cl,dl
+[ 	]*[a-f0-9]+:	3a ca                	cmp.s  cl,dl
 [ 	]*[a-f0-9]+:	66 39 d1             	cmp    cx,dx
-[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s cx,dx
+[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s  cx,dx
 [ 	]*[a-f0-9]+:	39 d1                	cmp    ecx,edx
-[ 	]*[a-f0-9]+:	3b ca                	cmp.s ecx,edx
+[ 	]*[a-f0-9]+:	3b ca                	cmp.s  ecx,edx
 [ 	]*[a-f0-9]+:	38 d1                	cmp    cl,dl
-[ 	]*[a-f0-9]+:	3a ca                	cmp.s cl,dl
+[ 	]*[a-f0-9]+:	3a ca                	cmp.s  cl,dl
 [ 	]*[a-f0-9]+:	66 39 d1             	cmp    cx,dx
-[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s cx,dx
+[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s  cx,dx
 [ 	]*[a-f0-9]+:	39 d1                	cmp    ecx,edx
-[ 	]*[a-f0-9]+:	3b ca                	cmp.s ecx,edx
+[ 	]*[a-f0-9]+:	3b ca                	cmp.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 39 d1             	cmp    rcx,rdx
-[ 	]*[a-f0-9]+:	48 3b ca             	cmp.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 3b ca             	cmp.s  rcx,rdx
 [ 	]*[a-f0-9]+:	48 39 d1             	cmp    rcx,rdx
-[ 	]*[a-f0-9]+:	48 3b ca             	cmp.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 3b ca             	cmp.s  rcx,rdx
 [ 	]*[a-f0-9]+:	88 d1                	mov    cl,dl
-[ 	]*[a-f0-9]+:	8a ca                	mov.s cl,dl
+[ 	]*[a-f0-9]+:	8a ca                	mov.s  cl,dl
 [ 	]*[a-f0-9]+:	66 89 d1             	mov    cx,dx
-[ 	]*[a-f0-9]+:	66 8b ca             	mov.s cx,dx
+[ 	]*[a-f0-9]+:	66 8b ca             	mov.s  cx,dx
 [ 	]*[a-f0-9]+:	89 d1                	mov    ecx,edx
-[ 	]*[a-f0-9]+:	8b ca                	mov.s ecx,edx
+[ 	]*[a-f0-9]+:	8b ca                	mov.s  ecx,edx
 [ 	]*[a-f0-9]+:	88 d1                	mov    cl,dl
-[ 	]*[a-f0-9]+:	8a ca                	mov.s cl,dl
+[ 	]*[a-f0-9]+:	8a ca                	mov.s  cl,dl
 [ 	]*[a-f0-9]+:	66 89 d1             	mov    cx,dx
-[ 	]*[a-f0-9]+:	66 8b ca             	mov.s cx,dx
+[ 	]*[a-f0-9]+:	66 8b ca             	mov.s  cx,dx
 [ 	]*[a-f0-9]+:	89 d1                	mov    ecx,edx
-[ 	]*[a-f0-9]+:	8b ca                	mov.s ecx,edx
+[ 	]*[a-f0-9]+:	8b ca                	mov.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 89 d1             	mov    rcx,rdx
-[ 	]*[a-f0-9]+:	48 8b ca             	mov.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 8b ca             	mov.s  rcx,rdx
 [ 	]*[a-f0-9]+:	48 89 d1             	mov    rcx,rdx
-[ 	]*[a-f0-9]+:	48 8b ca             	mov.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 8b ca             	mov.s  rcx,rdx
 [ 	]*[a-f0-9]+:	08 d1                	or     cl,dl
-[ 	]*[a-f0-9]+:	0a ca                	or.s cl,dl
+[ 	]*[a-f0-9]+:	0a ca                	or.s   cl,dl
 [ 	]*[a-f0-9]+:	66 09 d1             	or     cx,dx
-[ 	]*[a-f0-9]+:	66 0b ca             	or.s cx,dx
+[ 	]*[a-f0-9]+:	66 0b ca             	or.s   cx,dx
 [ 	]*[a-f0-9]+:	09 d1                	or     ecx,edx
-[ 	]*[a-f0-9]+:	0b ca                	or.s ecx,edx
+[ 	]*[a-f0-9]+:	0b ca                	or.s   ecx,edx
 [ 	]*[a-f0-9]+:	08 d1                	or     cl,dl
-[ 	]*[a-f0-9]+:	0a ca                	or.s cl,dl
+[ 	]*[a-f0-9]+:	0a ca                	or.s   cl,dl
 [ 	]*[a-f0-9]+:	66 09 d1             	or     cx,dx
-[ 	]*[a-f0-9]+:	66 0b ca             	or.s cx,dx
+[ 	]*[a-f0-9]+:	66 0b ca             	or.s   cx,dx
 [ 	]*[a-f0-9]+:	09 d1                	or     ecx,edx
-[ 	]*[a-f0-9]+:	0b ca                	or.s ecx,edx
+[ 	]*[a-f0-9]+:	0b ca                	or.s   ecx,edx
 [ 	]*[a-f0-9]+:	48 09 d1             	or     rcx,rdx
-[ 	]*[a-f0-9]+:	48 0b ca             	or.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 0b ca             	or.s   rcx,rdx
 [ 	]*[a-f0-9]+:	48 09 d1             	or     rcx,rdx
-[ 	]*[a-f0-9]+:	48 0b ca             	or.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 0b ca             	or.s   rcx,rdx
 [ 	]*[a-f0-9]+:	18 d1                	sbb    cl,dl
-[ 	]*[a-f0-9]+:	1a ca                	sbb.s cl,dl
+[ 	]*[a-f0-9]+:	1a ca                	sbb.s  cl,dl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbb    cx,dx
-[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s cx,dx
+[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s  cx,dx
 [ 	]*[a-f0-9]+:	19 d1                	sbb    ecx,edx
-[ 	]*[a-f0-9]+:	1b ca                	sbb.s ecx,edx
+[ 	]*[a-f0-9]+:	1b ca                	sbb.s  ecx,edx
 [ 	]*[a-f0-9]+:	18 d1                	sbb    cl,dl
-[ 	]*[a-f0-9]+:	1a ca                	sbb.s cl,dl
+[ 	]*[a-f0-9]+:	1a ca                	sbb.s  cl,dl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbb    cx,dx
-[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s cx,dx
+[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s  cx,dx
 [ 	]*[a-f0-9]+:	19 d1                	sbb    ecx,edx
-[ 	]*[a-f0-9]+:	1b ca                	sbb.s ecx,edx
+[ 	]*[a-f0-9]+:	1b ca                	sbb.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 19 d1             	sbb    rcx,rdx
-[ 	]*[a-f0-9]+:	48 1b ca             	sbb.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 1b ca             	sbb.s  rcx,rdx
 [ 	]*[a-f0-9]+:	48 19 d1             	sbb    rcx,rdx
-[ 	]*[a-f0-9]+:	48 1b ca             	sbb.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 1b ca             	sbb.s  rcx,rdx
 [ 	]*[a-f0-9]+:	28 d1                	sub    cl,dl
-[ 	]*[a-f0-9]+:	2a ca                	sub.s cl,dl
+[ 	]*[a-f0-9]+:	2a ca                	sub.s  cl,dl
 [ 	]*[a-f0-9]+:	66 29 d1             	sub    cx,dx
-[ 	]*[a-f0-9]+:	66 2b ca             	sub.s cx,dx
+[ 	]*[a-f0-9]+:	66 2b ca             	sub.s  cx,dx
 [ 	]*[a-f0-9]+:	29 d1                	sub    ecx,edx
-[ 	]*[a-f0-9]+:	2b ca                	sub.s ecx,edx
+[ 	]*[a-f0-9]+:	2b ca                	sub.s  ecx,edx
 [ 	]*[a-f0-9]+:	28 d1                	sub    cl,dl
-[ 	]*[a-f0-9]+:	2a ca                	sub.s cl,dl
+[ 	]*[a-f0-9]+:	2a ca                	sub.s  cl,dl
 [ 	]*[a-f0-9]+:	66 29 d1             	sub    cx,dx
-[ 	]*[a-f0-9]+:	66 2b ca             	sub.s cx,dx
+[ 	]*[a-f0-9]+:	66 2b ca             	sub.s  cx,dx
 [ 	]*[a-f0-9]+:	29 d1                	sub    ecx,edx
-[ 	]*[a-f0-9]+:	2b ca                	sub.s ecx,edx
+[ 	]*[a-f0-9]+:	2b ca                	sub.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 29 d1             	sub    rcx,rdx
-[ 	]*[a-f0-9]+:	48 2b ca             	sub.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 2b ca             	sub.s  rcx,rdx
 [ 	]*[a-f0-9]+:	48 29 d1             	sub    rcx,rdx
-[ 	]*[a-f0-9]+:	48 2b ca             	sub.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 2b ca             	sub.s  rcx,rdx
 [ 	]*[a-f0-9]+:	30 d1                	xor    cl,dl
-[ 	]*[a-f0-9]+:	32 ca                	xor.s cl,dl
+[ 	]*[a-f0-9]+:	32 ca                	xor.s  cl,dl
 [ 	]*[a-f0-9]+:	66 31 d1             	xor    cx,dx
-[ 	]*[a-f0-9]+:	66 33 ca             	xor.s cx,dx
+[ 	]*[a-f0-9]+:	66 33 ca             	xor.s  cx,dx
 [ 	]*[a-f0-9]+:	31 d1                	xor    ecx,edx
-[ 	]*[a-f0-9]+:	33 ca                	xor.s ecx,edx
+[ 	]*[a-f0-9]+:	33 ca                	xor.s  ecx,edx
 [ 	]*[a-f0-9]+:	30 d1                	xor    cl,dl
-[ 	]*[a-f0-9]+:	32 ca                	xor.s cl,dl
+[ 	]*[a-f0-9]+:	32 ca                	xor.s  cl,dl
 [ 	]*[a-f0-9]+:	66 31 d1             	xor    cx,dx
-[ 	]*[a-f0-9]+:	66 33 ca             	xor.s cx,dx
+[ 	]*[a-f0-9]+:	66 33 ca             	xor.s  cx,dx
 [ 	]*[a-f0-9]+:	31 d1                	xor    ecx,edx
-[ 	]*[a-f0-9]+:	33 ca                	xor.s ecx,edx
+[ 	]*[a-f0-9]+:	33 ca                	xor.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 31 d1             	xor    rcx,rdx
-[ 	]*[a-f0-9]+:	48 33 ca             	xor.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 33 ca             	xor.s  rcx,rdx
 [ 	]*[a-f0-9]+:	48 31 d1             	xor    rcx,rdx
-[ 	]*[a-f0-9]+:	48 33 ca             	xor.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 33 ca             	xor.s  rcx,rdx
 [ 	]*[a-f0-9]+:	c5 fd 28 f4          	vmovapd ymm6,ymm4
 [ 	]*[a-f0-9]+:	c5 fd 29 e6          	vmovapd.s ymm6,ymm4
 [ 	]*[a-f0-9]+:	c5 fc 28 f4          	vmovaps ymm6,ymm4
@@ -203,77 +203,77 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	0f 6f e0             	movq   mm4,mm0
 [ 	]*[a-f0-9]+:	0f 7f c4             	movq.s mm4,mm0
 [ 	]*[a-f0-9]+:	00 d1                	add    cl,dl
-[ 	]*[a-f0-9]+:	02 ca                	add.s cl,dl
+[ 	]*[a-f0-9]+:	02 ca                	add.s  cl,dl
 [ 	]*[a-f0-9]+:	66 01 d1             	add    cx,dx
-[ 	]*[a-f0-9]+:	66 03 ca             	add.s cx,dx
+[ 	]*[a-f0-9]+:	66 03 ca             	add.s  cx,dx
 [ 	]*[a-f0-9]+:	01 d1                	add    ecx,edx
-[ 	]*[a-f0-9]+:	03 ca                	add.s ecx,edx
+[ 	]*[a-f0-9]+:	03 ca                	add.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 01 d1             	add    rcx,rdx
-[ 	]*[a-f0-9]+:	48 03 ca             	add.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 03 ca             	add.s  rcx,rdx
 [ 	]*[a-f0-9]+:	10 d1                	adc    cl,dl
-[ 	]*[a-f0-9]+:	12 ca                	adc.s cl,dl
+[ 	]*[a-f0-9]+:	12 ca                	adc.s  cl,dl
 [ 	]*[a-f0-9]+:	66 11 d1             	adc    cx,dx
-[ 	]*[a-f0-9]+:	66 13 ca             	adc.s cx,dx
+[ 	]*[a-f0-9]+:	66 13 ca             	adc.s  cx,dx
 [ 	]*[a-f0-9]+:	11 d1                	adc    ecx,edx
-[ 	]*[a-f0-9]+:	13 ca                	adc.s ecx,edx
+[ 	]*[a-f0-9]+:	13 ca                	adc.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 11 d1             	adc    rcx,rdx
-[ 	]*[a-f0-9]+:	48 13 ca             	adc.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 13 ca             	adc.s  rcx,rdx
 [ 	]*[a-f0-9]+:	20 d1                	and    cl,dl
-[ 	]*[a-f0-9]+:	22 ca                	and.s cl,dl
+[ 	]*[a-f0-9]+:	22 ca                	and.s  cl,dl
 [ 	]*[a-f0-9]+:	66 21 d1             	and    cx,dx
-[ 	]*[a-f0-9]+:	66 23 ca             	and.s cx,dx
+[ 	]*[a-f0-9]+:	66 23 ca             	and.s  cx,dx
 [ 	]*[a-f0-9]+:	21 d1                	and    ecx,edx
-[ 	]*[a-f0-9]+:	23 ca                	and.s ecx,edx
+[ 	]*[a-f0-9]+:	23 ca                	and.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 21 d1             	and    rcx,rdx
-[ 	]*[a-f0-9]+:	48 23 ca             	and.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 23 ca             	and.s  rcx,rdx
 [ 	]*[a-f0-9]+:	38 d1                	cmp    cl,dl
-[ 	]*[a-f0-9]+:	3a ca                	cmp.s cl,dl
+[ 	]*[a-f0-9]+:	3a ca                	cmp.s  cl,dl
 [ 	]*[a-f0-9]+:	66 39 d1             	cmp    cx,dx
-[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s cx,dx
+[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s  cx,dx
 [ 	]*[a-f0-9]+:	39 d1                	cmp    ecx,edx
-[ 	]*[a-f0-9]+:	3b ca                	cmp.s ecx,edx
+[ 	]*[a-f0-9]+:	3b ca                	cmp.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 39 d1             	cmp    rcx,rdx
-[ 	]*[a-f0-9]+:	48 3b ca             	cmp.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 3b ca             	cmp.s  rcx,rdx
 [ 	]*[a-f0-9]+:	88 d1                	mov    cl,dl
-[ 	]*[a-f0-9]+:	8a ca                	mov.s cl,dl
+[ 	]*[a-f0-9]+:	8a ca                	mov.s  cl,dl
 [ 	]*[a-f0-9]+:	66 89 d1             	mov    cx,dx
-[ 	]*[a-f0-9]+:	66 8b ca             	mov.s cx,dx
+[ 	]*[a-f0-9]+:	66 8b ca             	mov.s  cx,dx
 [ 	]*[a-f0-9]+:	89 d1                	mov    ecx,edx
-[ 	]*[a-f0-9]+:	8b ca                	mov.s ecx,edx
+[ 	]*[a-f0-9]+:	8b ca                	mov.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 89 d1             	mov    rcx,rdx
-[ 	]*[a-f0-9]+:	48 8b ca             	mov.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 8b ca             	mov.s  rcx,rdx
 [ 	]*[a-f0-9]+:	08 d1                	or     cl,dl
-[ 	]*[a-f0-9]+:	0a ca                	or.s cl,dl
+[ 	]*[a-f0-9]+:	0a ca                	or.s   cl,dl
 [ 	]*[a-f0-9]+:	66 09 d1             	or     cx,dx
-[ 	]*[a-f0-9]+:	66 0b ca             	or.s cx,dx
+[ 	]*[a-f0-9]+:	66 0b ca             	or.s   cx,dx
 [ 	]*[a-f0-9]+:	09 d1                	or     ecx,edx
-[ 	]*[a-f0-9]+:	0b ca                	or.s ecx,edx
+[ 	]*[a-f0-9]+:	0b ca                	or.s   ecx,edx
 [ 	]*[a-f0-9]+:	48 09 d1             	or     rcx,rdx
-[ 	]*[a-f0-9]+:	48 0b ca             	or.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 0b ca             	or.s   rcx,rdx
 [ 	]*[a-f0-9]+:	18 d1                	sbb    cl,dl
-[ 	]*[a-f0-9]+:	1a ca                	sbb.s cl,dl
+[ 	]*[a-f0-9]+:	1a ca                	sbb.s  cl,dl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbb    cx,dx
-[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s cx,dx
+[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s  cx,dx
 [ 	]*[a-f0-9]+:	19 d1                	sbb    ecx,edx
-[ 	]*[a-f0-9]+:	1b ca                	sbb.s ecx,edx
+[ 	]*[a-f0-9]+:	1b ca                	sbb.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 19 d1             	sbb    rcx,rdx
-[ 	]*[a-f0-9]+:	48 1b ca             	sbb.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 1b ca             	sbb.s  rcx,rdx
 [ 	]*[a-f0-9]+:	28 d1                	sub    cl,dl
-[ 	]*[a-f0-9]+:	2a ca                	sub.s cl,dl
+[ 	]*[a-f0-9]+:	2a ca                	sub.s  cl,dl
 [ 	]*[a-f0-9]+:	66 29 d1             	sub    cx,dx
-[ 	]*[a-f0-9]+:	66 2b ca             	sub.s cx,dx
+[ 	]*[a-f0-9]+:	66 2b ca             	sub.s  cx,dx
 [ 	]*[a-f0-9]+:	29 d1                	sub    ecx,edx
-[ 	]*[a-f0-9]+:	2b ca                	sub.s ecx,edx
+[ 	]*[a-f0-9]+:	2b ca                	sub.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 29 d1             	sub    rcx,rdx
-[ 	]*[a-f0-9]+:	48 2b ca             	sub.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 2b ca             	sub.s  rcx,rdx
 [ 	]*[a-f0-9]+:	30 d1                	xor    cl,dl
-[ 	]*[a-f0-9]+:	32 ca                	xor.s cl,dl
+[ 	]*[a-f0-9]+:	32 ca                	xor.s  cl,dl
 [ 	]*[a-f0-9]+:	66 31 d1             	xor    cx,dx
-[ 	]*[a-f0-9]+:	66 33 ca             	xor.s cx,dx
+[ 	]*[a-f0-9]+:	66 33 ca             	xor.s  cx,dx
 [ 	]*[a-f0-9]+:	31 d1                	xor    ecx,edx
-[ 	]*[a-f0-9]+:	33 ca                	xor.s ecx,edx
+[ 	]*[a-f0-9]+:	33 ca                	xor.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 31 d1             	xor    rcx,rdx
-[ 	]*[a-f0-9]+:	48 33 ca             	xor.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 33 ca             	xor.s  rcx,rdx
 [ 	]*[a-f0-9]+:	c5 fd 28 f4          	vmovapd ymm6,ymm4
 [ 	]*[a-f0-9]+:	c5 fd 29 e6          	vmovapd.s ymm6,ymm4
 [ 	]*[a-f0-9]+:	c5 fc 28 f4          	vmovaps ymm6,ymm4
diff --git a/gas/testsuite/gas/i386/x86-64-opts.d b/gas/testsuite/gas/i386/x86-64-opts.d
index 478f3fb3ef..daa9484ce5 100644
--- a/gas/testsuite/gas/i386/x86-64-opts.d
+++ b/gas/testsuite/gas/i386/x86-64-opts.d
@@ -88,21 +88,21 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	48 89 d1             	movq   %rdx,%rcx
 [ 	]*[a-f0-9]+:	48 8b ca             	movq.s %rdx,%rcx
 [ 	]*[a-f0-9]+:	08 d1                	orb    %dl,%cl
-[ 	]*[a-f0-9]+:	0a ca                	orb.s %dl,%cl
+[ 	]*[a-f0-9]+:	0a ca                	orb.s  %dl,%cl
 [ 	]*[a-f0-9]+:	66 09 d1             	orw    %dx,%cx
-[ 	]*[a-f0-9]+:	66 0b ca             	orw.s %dx,%cx
+[ 	]*[a-f0-9]+:	66 0b ca             	orw.s  %dx,%cx
 [ 	]*[a-f0-9]+:	09 d1                	orl    %edx,%ecx
-[ 	]*[a-f0-9]+:	0b ca                	orl.s %edx,%ecx
+[ 	]*[a-f0-9]+:	0b ca                	orl.s  %edx,%ecx
 [ 	]*[a-f0-9]+:	08 d1                	orb    %dl,%cl
-[ 	]*[a-f0-9]+:	0a ca                	orb.s %dl,%cl
+[ 	]*[a-f0-9]+:	0a ca                	orb.s  %dl,%cl
 [ 	]*[a-f0-9]+:	66 09 d1             	orw    %dx,%cx
-[ 	]*[a-f0-9]+:	66 0b ca             	orw.s %dx,%cx
+[ 	]*[a-f0-9]+:	66 0b ca             	orw.s  %dx,%cx
 [ 	]*[a-f0-9]+:	09 d1                	orl    %edx,%ecx
-[ 	]*[a-f0-9]+:	0b ca                	orl.s %edx,%ecx
+[ 	]*[a-f0-9]+:	0b ca                	orl.s  %edx,%ecx
 [ 	]*[a-f0-9]+:	48 09 d1             	orq    %rdx,%rcx
-[ 	]*[a-f0-9]+:	48 0b ca             	orq.s %rdx,%rcx
+[ 	]*[a-f0-9]+:	48 0b ca             	orq.s  %rdx,%rcx
 [ 	]*[a-f0-9]+:	48 09 d1             	orq    %rdx,%rcx
-[ 	]*[a-f0-9]+:	48 0b ca             	orq.s %rdx,%rcx
+[ 	]*[a-f0-9]+:	48 0b ca             	orq.s  %rdx,%rcx
 [ 	]*[a-f0-9]+:	18 d1                	sbbb   %dl,%cl
 [ 	]*[a-f0-9]+:	1a ca                	sbbb.s %dl,%cl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbbw   %dx,%cx
@@ -242,13 +242,13 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	48 89 d1             	movq   %rdx,%rcx
 [ 	]*[a-f0-9]+:	48 8b ca             	movq.s %rdx,%rcx
 [ 	]*[a-f0-9]+:	08 d1                	orb    %dl,%cl
-[ 	]*[a-f0-9]+:	0a ca                	orb.s %dl,%cl
+[ 	]*[a-f0-9]+:	0a ca                	orb.s  %dl,%cl
 [ 	]*[a-f0-9]+:	66 09 d1             	orw    %dx,%cx
-[ 	]*[a-f0-9]+:	66 0b ca             	orw.s %dx,%cx
+[ 	]*[a-f0-9]+:	66 0b ca             	orw.s  %dx,%cx
 [ 	]*[a-f0-9]+:	09 d1                	orl    %edx,%ecx
-[ 	]*[a-f0-9]+:	0b ca                	orl.s %edx,%ecx
+[ 	]*[a-f0-9]+:	0b ca                	orl.s  %edx,%ecx
 [ 	]*[a-f0-9]+:	48 09 d1             	orq    %rdx,%rcx
-[ 	]*[a-f0-9]+:	48 0b ca             	orq.s %rdx,%rcx
+[ 	]*[a-f0-9]+:	48 0b ca             	orq.s  %rdx,%rcx
 [ 	]*[a-f0-9]+:	18 d1                	sbbb   %dl,%cl
 [ 	]*[a-f0-9]+:	1a ca                	sbbb.s %dl,%cl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbbw   %dx,%cx
diff --git a/gas/testsuite/gas/i386/x86-64-sse2avx-opts-intel.d b/gas/testsuite/gas/i386/x86-64-sse2avx-opts-intel.d
index 1fe91f4780..6d9c81c922 100644
--- a/gas/testsuite/gas/i386/x86-64-sse2avx-opts-intel.d
+++ b/gas/testsuite/gas/i386/x86-64-sse2avx-opts-intel.d
@@ -10,149 +10,149 @@ Disassembly of section .text:
 
 0+ <_start>:
 [ 	]*[a-f0-9]+:	00 d1                	add    cl,dl
-[ 	]*[a-f0-9]+:	02 ca                	add.s cl,dl
+[ 	]*[a-f0-9]+:	02 ca                	add.s  cl,dl
 [ 	]*[a-f0-9]+:	66 01 d1             	add    cx,dx
-[ 	]*[a-f0-9]+:	66 03 ca             	add.s cx,dx
+[ 	]*[a-f0-9]+:	66 03 ca             	add.s  cx,dx
 [ 	]*[a-f0-9]+:	01 d1                	add    ecx,edx
-[ 	]*[a-f0-9]+:	03 ca                	add.s ecx,edx
+[ 	]*[a-f0-9]+:	03 ca                	add.s  ecx,edx
 [ 	]*[a-f0-9]+:	00 d1                	add    cl,dl
-[ 	]*[a-f0-9]+:	02 ca                	add.s cl,dl
+[ 	]*[a-f0-9]+:	02 ca                	add.s  cl,dl
 [ 	]*[a-f0-9]+:	66 01 d1             	add    cx,dx
-[ 	]*[a-f0-9]+:	66 03 ca             	add.s cx,dx
+[ 	]*[a-f0-9]+:	66 03 ca             	add.s  cx,dx
 [ 	]*[a-f0-9]+:	01 d1                	add    ecx,edx
-[ 	]*[a-f0-9]+:	03 ca                	add.s ecx,edx
+[ 	]*[a-f0-9]+:	03 ca                	add.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 01 d1             	add    rcx,rdx
-[ 	]*[a-f0-9]+:	48 03 ca             	add.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 03 ca             	add.s  rcx,rdx
 [ 	]*[a-f0-9]+:	48 01 d1             	add    rcx,rdx
-[ 	]*[a-f0-9]+:	48 03 ca             	add.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 03 ca             	add.s  rcx,rdx
 [ 	]*[a-f0-9]+:	10 d1                	adc    cl,dl
-[ 	]*[a-f0-9]+:	12 ca                	adc.s cl,dl
+[ 	]*[a-f0-9]+:	12 ca                	adc.s  cl,dl
 [ 	]*[a-f0-9]+:	66 11 d1             	adc    cx,dx
-[ 	]*[a-f0-9]+:	66 13 ca             	adc.s cx,dx
+[ 	]*[a-f0-9]+:	66 13 ca             	adc.s  cx,dx
 [ 	]*[a-f0-9]+:	11 d1                	adc    ecx,edx
-[ 	]*[a-f0-9]+:	13 ca                	adc.s ecx,edx
+[ 	]*[a-f0-9]+:	13 ca                	adc.s  ecx,edx
 [ 	]*[a-f0-9]+:	10 d1                	adc    cl,dl
-[ 	]*[a-f0-9]+:	12 ca                	adc.s cl,dl
+[ 	]*[a-f0-9]+:	12 ca                	adc.s  cl,dl
 [ 	]*[a-f0-9]+:	66 11 d1             	adc    cx,dx
-[ 	]*[a-f0-9]+:	66 13 ca             	adc.s cx,dx
+[ 	]*[a-f0-9]+:	66 13 ca             	adc.s  cx,dx
 [ 	]*[a-f0-9]+:	11 d1                	adc    ecx,edx
-[ 	]*[a-f0-9]+:	13 ca                	adc.s ecx,edx
+[ 	]*[a-f0-9]+:	13 ca                	adc.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 11 d1             	adc    rcx,rdx
-[ 	]*[a-f0-9]+:	48 13 ca             	adc.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 13 ca             	adc.s  rcx,rdx
 [ 	]*[a-f0-9]+:	48 11 d1             	adc    rcx,rdx
-[ 	]*[a-f0-9]+:	48 13 ca             	adc.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 13 ca             	adc.s  rcx,rdx
 [ 	]*[a-f0-9]+:	20 d1                	and    cl,dl
-[ 	]*[a-f0-9]+:	22 ca                	and.s cl,dl
+[ 	]*[a-f0-9]+:	22 ca                	and.s  cl,dl
 [ 	]*[a-f0-9]+:	66 21 d1             	and    cx,dx
-[ 	]*[a-f0-9]+:	66 23 ca             	and.s cx,dx
+[ 	]*[a-f0-9]+:	66 23 ca             	and.s  cx,dx
 [ 	]*[a-f0-9]+:	21 d1                	and    ecx,edx
-[ 	]*[a-f0-9]+:	23 ca                	and.s ecx,edx
+[ 	]*[a-f0-9]+:	23 ca                	and.s  ecx,edx
 [ 	]*[a-f0-9]+:	20 d1                	and    cl,dl
-[ 	]*[a-f0-9]+:	22 ca                	and.s cl,dl
+[ 	]*[a-f0-9]+:	22 ca                	and.s  cl,dl
 [ 	]*[a-f0-9]+:	66 21 d1             	and    cx,dx
-[ 	]*[a-f0-9]+:	66 23 ca             	and.s cx,dx
+[ 	]*[a-f0-9]+:	66 23 ca             	and.s  cx,dx
 [ 	]*[a-f0-9]+:	21 d1                	and    ecx,edx
-[ 	]*[a-f0-9]+:	23 ca                	and.s ecx,edx
+[ 	]*[a-f0-9]+:	23 ca                	and.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 21 d1             	and    rcx,rdx
-[ 	]*[a-f0-9]+:	48 23 ca             	and.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 23 ca             	and.s  rcx,rdx
 [ 	]*[a-f0-9]+:	48 21 d1             	and    rcx,rdx
-[ 	]*[a-f0-9]+:	48 23 ca             	and.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 23 ca             	and.s  rcx,rdx
 [ 	]*[a-f0-9]+:	38 d1                	cmp    cl,dl
-[ 	]*[a-f0-9]+:	3a ca                	cmp.s cl,dl
+[ 	]*[a-f0-9]+:	3a ca                	cmp.s  cl,dl
 [ 	]*[a-f0-9]+:	66 39 d1             	cmp    cx,dx
-[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s cx,dx
+[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s  cx,dx
 [ 	]*[a-f0-9]+:	39 d1                	cmp    ecx,edx
-[ 	]*[a-f0-9]+:	3b ca                	cmp.s ecx,edx
+[ 	]*[a-f0-9]+:	3b ca                	cmp.s  ecx,edx
 [ 	]*[a-f0-9]+:	38 d1                	cmp    cl,dl
-[ 	]*[a-f0-9]+:	3a ca                	cmp.s cl,dl
+[ 	]*[a-f0-9]+:	3a ca                	cmp.s  cl,dl
 [ 	]*[a-f0-9]+:	66 39 d1             	cmp    cx,dx
-[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s cx,dx
+[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s  cx,dx
 [ 	]*[a-f0-9]+:	39 d1                	cmp    ecx,edx
-[ 	]*[a-f0-9]+:	3b ca                	cmp.s ecx,edx
+[ 	]*[a-f0-9]+:	3b ca                	cmp.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 39 d1             	cmp    rcx,rdx
-[ 	]*[a-f0-9]+:	48 3b ca             	cmp.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 3b ca             	cmp.s  rcx,rdx
 [ 	]*[a-f0-9]+:	48 39 d1             	cmp    rcx,rdx
-[ 	]*[a-f0-9]+:	48 3b ca             	cmp.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 3b ca             	cmp.s  rcx,rdx
 [ 	]*[a-f0-9]+:	88 d1                	mov    cl,dl
-[ 	]*[a-f0-9]+:	8a ca                	mov.s cl,dl
+[ 	]*[a-f0-9]+:	8a ca                	mov.s  cl,dl
 [ 	]*[a-f0-9]+:	66 89 d1             	mov    cx,dx
-[ 	]*[a-f0-9]+:	66 8b ca             	mov.s cx,dx
+[ 	]*[a-f0-9]+:	66 8b ca             	mov.s  cx,dx
 [ 	]*[a-f0-9]+:	89 d1                	mov    ecx,edx
-[ 	]*[a-f0-9]+:	8b ca                	mov.s ecx,edx
+[ 	]*[a-f0-9]+:	8b ca                	mov.s  ecx,edx
 [ 	]*[a-f0-9]+:	88 d1                	mov    cl,dl
-[ 	]*[a-f0-9]+:	8a ca                	mov.s cl,dl
+[ 	]*[a-f0-9]+:	8a ca                	mov.s  cl,dl
 [ 	]*[a-f0-9]+:	66 89 d1             	mov    cx,dx
-[ 	]*[a-f0-9]+:	66 8b ca             	mov.s cx,dx
+[ 	]*[a-f0-9]+:	66 8b ca             	mov.s  cx,dx
 [ 	]*[a-f0-9]+:	89 d1                	mov    ecx,edx
-[ 	]*[a-f0-9]+:	8b ca                	mov.s ecx,edx
+[ 	]*[a-f0-9]+:	8b ca                	mov.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 89 d1             	mov    rcx,rdx
-[ 	]*[a-f0-9]+:	48 8b ca             	mov.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 8b ca             	mov.s  rcx,rdx
 [ 	]*[a-f0-9]+:	48 89 d1             	mov    rcx,rdx
-[ 	]*[a-f0-9]+:	48 8b ca             	mov.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 8b ca             	mov.s  rcx,rdx
 [ 	]*[a-f0-9]+:	08 d1                	or     cl,dl
-[ 	]*[a-f0-9]+:	0a ca                	or.s cl,dl
+[ 	]*[a-f0-9]+:	0a ca                	or.s   cl,dl
 [ 	]*[a-f0-9]+:	66 09 d1             	or     cx,dx
-[ 	]*[a-f0-9]+:	66 0b ca             	or.s cx,dx
+[ 	]*[a-f0-9]+:	66 0b ca             	or.s   cx,dx
 [ 	]*[a-f0-9]+:	09 d1                	or     ecx,edx
-[ 	]*[a-f0-9]+:	0b ca                	or.s ecx,edx
+[ 	]*[a-f0-9]+:	0b ca                	or.s   ecx,edx
 [ 	]*[a-f0-9]+:	08 d1                	or     cl,dl
-[ 	]*[a-f0-9]+:	0a ca                	or.s cl,dl
+[ 	]*[a-f0-9]+:	0a ca                	or.s   cl,dl
 [ 	]*[a-f0-9]+:	66 09 d1             	or     cx,dx
-[ 	]*[a-f0-9]+:	66 0b ca             	or.s cx,dx
+[ 	]*[a-f0-9]+:	66 0b ca             	or.s   cx,dx
 [ 	]*[a-f0-9]+:	09 d1                	or     ecx,edx
-[ 	]*[a-f0-9]+:	0b ca                	or.s ecx,edx
+[ 	]*[a-f0-9]+:	0b ca                	or.s   ecx,edx
 [ 	]*[a-f0-9]+:	48 09 d1             	or     rcx,rdx
-[ 	]*[a-f0-9]+:	48 0b ca             	or.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 0b ca             	or.s   rcx,rdx
 [ 	]*[a-f0-9]+:	48 09 d1             	or     rcx,rdx
-[ 	]*[a-f0-9]+:	48 0b ca             	or.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 0b ca             	or.s   rcx,rdx
 [ 	]*[a-f0-9]+:	18 d1                	sbb    cl,dl
-[ 	]*[a-f0-9]+:	1a ca                	sbb.s cl,dl
+[ 	]*[a-f0-9]+:	1a ca                	sbb.s  cl,dl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbb    cx,dx
-[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s cx,dx
+[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s  cx,dx
 [ 	]*[a-f0-9]+:	19 d1                	sbb    ecx,edx
-[ 	]*[a-f0-9]+:	1b ca                	sbb.s ecx,edx
+[ 	]*[a-f0-9]+:	1b ca                	sbb.s  ecx,edx
 [ 	]*[a-f0-9]+:	18 d1                	sbb    cl,dl
-[ 	]*[a-f0-9]+:	1a ca                	sbb.s cl,dl
+[ 	]*[a-f0-9]+:	1a ca                	sbb.s  cl,dl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbb    cx,dx
-[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s cx,dx
+[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s  cx,dx
 [ 	]*[a-f0-9]+:	19 d1                	sbb    ecx,edx
-[ 	]*[a-f0-9]+:	1b ca                	sbb.s ecx,edx
+[ 	]*[a-f0-9]+:	1b ca                	sbb.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 19 d1             	sbb    rcx,rdx
-[ 	]*[a-f0-9]+:	48 1b ca             	sbb.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 1b ca             	sbb.s  rcx,rdx
 [ 	]*[a-f0-9]+:	48 19 d1             	sbb    rcx,rdx
-[ 	]*[a-f0-9]+:	48 1b ca             	sbb.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 1b ca             	sbb.s  rcx,rdx
 [ 	]*[a-f0-9]+:	28 d1                	sub    cl,dl
-[ 	]*[a-f0-9]+:	2a ca                	sub.s cl,dl
+[ 	]*[a-f0-9]+:	2a ca                	sub.s  cl,dl
 [ 	]*[a-f0-9]+:	66 29 d1             	sub    cx,dx
-[ 	]*[a-f0-9]+:	66 2b ca             	sub.s cx,dx
+[ 	]*[a-f0-9]+:	66 2b ca             	sub.s  cx,dx
 [ 	]*[a-f0-9]+:	29 d1                	sub    ecx,edx
-[ 	]*[a-f0-9]+:	2b ca                	sub.s ecx,edx
+[ 	]*[a-f0-9]+:	2b ca                	sub.s  ecx,edx
 [ 	]*[a-f0-9]+:	28 d1                	sub    cl,dl
-[ 	]*[a-f0-9]+:	2a ca                	sub.s cl,dl
+[ 	]*[a-f0-9]+:	2a ca                	sub.s  cl,dl
 [ 	]*[a-f0-9]+:	66 29 d1             	sub    cx,dx
-[ 	]*[a-f0-9]+:	66 2b ca             	sub.s cx,dx
+[ 	]*[a-f0-9]+:	66 2b ca             	sub.s  cx,dx
 [ 	]*[a-f0-9]+:	29 d1                	sub    ecx,edx
-[ 	]*[a-f0-9]+:	2b ca                	sub.s ecx,edx
+[ 	]*[a-f0-9]+:	2b ca                	sub.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 29 d1             	sub    rcx,rdx
-[ 	]*[a-f0-9]+:	48 2b ca             	sub.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 2b ca             	sub.s  rcx,rdx
 [ 	]*[a-f0-9]+:	48 29 d1             	sub    rcx,rdx
-[ 	]*[a-f0-9]+:	48 2b ca             	sub.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 2b ca             	sub.s  rcx,rdx
 [ 	]*[a-f0-9]+:	30 d1                	xor    cl,dl
-[ 	]*[a-f0-9]+:	32 ca                	xor.s cl,dl
+[ 	]*[a-f0-9]+:	32 ca                	xor.s  cl,dl
 [ 	]*[a-f0-9]+:	66 31 d1             	xor    cx,dx
-[ 	]*[a-f0-9]+:	66 33 ca             	xor.s cx,dx
+[ 	]*[a-f0-9]+:	66 33 ca             	xor.s  cx,dx
 [ 	]*[a-f0-9]+:	31 d1                	xor    ecx,edx
-[ 	]*[a-f0-9]+:	33 ca                	xor.s ecx,edx
+[ 	]*[a-f0-9]+:	33 ca                	xor.s  ecx,edx
 [ 	]*[a-f0-9]+:	30 d1                	xor    cl,dl
-[ 	]*[a-f0-9]+:	32 ca                	xor.s cl,dl
+[ 	]*[a-f0-9]+:	32 ca                	xor.s  cl,dl
 [ 	]*[a-f0-9]+:	66 31 d1             	xor    cx,dx
-[ 	]*[a-f0-9]+:	66 33 ca             	xor.s cx,dx
+[ 	]*[a-f0-9]+:	66 33 ca             	xor.s  cx,dx
 [ 	]*[a-f0-9]+:	31 d1                	xor    ecx,edx
-[ 	]*[a-f0-9]+:	33 ca                	xor.s ecx,edx
+[ 	]*[a-f0-9]+:	33 ca                	xor.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 31 d1             	xor    rcx,rdx
-[ 	]*[a-f0-9]+:	48 33 ca             	xor.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 33 ca             	xor.s  rcx,rdx
 [ 	]*[a-f0-9]+:	48 31 d1             	xor    rcx,rdx
-[ 	]*[a-f0-9]+:	48 33 ca             	xor.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 33 ca             	xor.s  rcx,rdx
 [ 	]*[a-f0-9]+:	c5 fd 28 f4          	vmovapd ymm6,ymm4
 [ 	]*[a-f0-9]+:	c5 fd 29 e6          	vmovapd.s ymm6,ymm4
 [ 	]*[a-f0-9]+:	c5 fc 28 f4          	vmovaps ymm6,ymm4
@@ -204,77 +204,77 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	0f 6f e0             	movq   mm4,mm0
 [ 	]*[a-f0-9]+:	0f 7f c4             	movq.s mm4,mm0
 [ 	]*[a-f0-9]+:	00 d1                	add    cl,dl
-[ 	]*[a-f0-9]+:	02 ca                	add.s cl,dl
+[ 	]*[a-f0-9]+:	02 ca                	add.s  cl,dl
 [ 	]*[a-f0-9]+:	66 01 d1             	add    cx,dx
-[ 	]*[a-f0-9]+:	66 03 ca             	add.s cx,dx
+[ 	]*[a-f0-9]+:	66 03 ca             	add.s  cx,dx
 [ 	]*[a-f0-9]+:	01 d1                	add    ecx,edx
-[ 	]*[a-f0-9]+:	03 ca                	add.s ecx,edx
+[ 	]*[a-f0-9]+:	03 ca                	add.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 01 d1             	add    rcx,rdx
-[ 	]*[a-f0-9]+:	48 03 ca             	add.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 03 ca             	add.s  rcx,rdx
 [ 	]*[a-f0-9]+:	10 d1                	adc    cl,dl
-[ 	]*[a-f0-9]+:	12 ca                	adc.s cl,dl
+[ 	]*[a-f0-9]+:	12 ca                	adc.s  cl,dl
 [ 	]*[a-f0-9]+:	66 11 d1             	adc    cx,dx
-[ 	]*[a-f0-9]+:	66 13 ca             	adc.s cx,dx
+[ 	]*[a-f0-9]+:	66 13 ca             	adc.s  cx,dx
 [ 	]*[a-f0-9]+:	11 d1                	adc    ecx,edx
-[ 	]*[a-f0-9]+:	13 ca                	adc.s ecx,edx
+[ 	]*[a-f0-9]+:	13 ca                	adc.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 11 d1             	adc    rcx,rdx
-[ 	]*[a-f0-9]+:	48 13 ca             	adc.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 13 ca             	adc.s  rcx,rdx
 [ 	]*[a-f0-9]+:	20 d1                	and    cl,dl
-[ 	]*[a-f0-9]+:	22 ca                	and.s cl,dl
+[ 	]*[a-f0-9]+:	22 ca                	and.s  cl,dl
 [ 	]*[a-f0-9]+:	66 21 d1             	and    cx,dx
-[ 	]*[a-f0-9]+:	66 23 ca             	and.s cx,dx
+[ 	]*[a-f0-9]+:	66 23 ca             	and.s  cx,dx
 [ 	]*[a-f0-9]+:	21 d1                	and    ecx,edx
-[ 	]*[a-f0-9]+:	23 ca                	and.s ecx,edx
+[ 	]*[a-f0-9]+:	23 ca                	and.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 21 d1             	and    rcx,rdx
-[ 	]*[a-f0-9]+:	48 23 ca             	and.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 23 ca             	and.s  rcx,rdx
 [ 	]*[a-f0-9]+:	38 d1                	cmp    cl,dl
-[ 	]*[a-f0-9]+:	3a ca                	cmp.s cl,dl
+[ 	]*[a-f0-9]+:	3a ca                	cmp.s  cl,dl
 [ 	]*[a-f0-9]+:	66 39 d1             	cmp    cx,dx
-[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s cx,dx
+[ 	]*[a-f0-9]+:	66 3b ca             	cmp.s  cx,dx
 [ 	]*[a-f0-9]+:	39 d1                	cmp    ecx,edx
-[ 	]*[a-f0-9]+:	3b ca                	cmp.s ecx,edx
+[ 	]*[a-f0-9]+:	3b ca                	cmp.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 39 d1             	cmp    rcx,rdx
-[ 	]*[a-f0-9]+:	48 3b ca             	cmp.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 3b ca             	cmp.s  rcx,rdx
 [ 	]*[a-f0-9]+:	88 d1                	mov    cl,dl
-[ 	]*[a-f0-9]+:	8a ca                	mov.s cl,dl
+[ 	]*[a-f0-9]+:	8a ca                	mov.s  cl,dl
 [ 	]*[a-f0-9]+:	66 89 d1             	mov    cx,dx
-[ 	]*[a-f0-9]+:	66 8b ca             	mov.s cx,dx
+[ 	]*[a-f0-9]+:	66 8b ca             	mov.s  cx,dx
 [ 	]*[a-f0-9]+:	89 d1                	mov    ecx,edx
-[ 	]*[a-f0-9]+:	8b ca                	mov.s ecx,edx
+[ 	]*[a-f0-9]+:	8b ca                	mov.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 89 d1             	mov    rcx,rdx
-[ 	]*[a-f0-9]+:	48 8b ca             	mov.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 8b ca             	mov.s  rcx,rdx
 [ 	]*[a-f0-9]+:	08 d1                	or     cl,dl
-[ 	]*[a-f0-9]+:	0a ca                	or.s cl,dl
+[ 	]*[a-f0-9]+:	0a ca                	or.s   cl,dl
 [ 	]*[a-f0-9]+:	66 09 d1             	or     cx,dx
-[ 	]*[a-f0-9]+:	66 0b ca             	or.s cx,dx
+[ 	]*[a-f0-9]+:	66 0b ca             	or.s   cx,dx
 [ 	]*[a-f0-9]+:	09 d1                	or     ecx,edx
-[ 	]*[a-f0-9]+:	0b ca                	or.s ecx,edx
+[ 	]*[a-f0-9]+:	0b ca                	or.s   ecx,edx
 [ 	]*[a-f0-9]+:	48 09 d1             	or     rcx,rdx
-[ 	]*[a-f0-9]+:	48 0b ca             	or.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 0b ca             	or.s   rcx,rdx
 [ 	]*[a-f0-9]+:	18 d1                	sbb    cl,dl
-[ 	]*[a-f0-9]+:	1a ca                	sbb.s cl,dl
+[ 	]*[a-f0-9]+:	1a ca                	sbb.s  cl,dl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbb    cx,dx
-[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s cx,dx
+[ 	]*[a-f0-9]+:	66 1b ca             	sbb.s  cx,dx
 [ 	]*[a-f0-9]+:	19 d1                	sbb    ecx,edx
-[ 	]*[a-f0-9]+:	1b ca                	sbb.s ecx,edx
+[ 	]*[a-f0-9]+:	1b ca                	sbb.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 19 d1             	sbb    rcx,rdx
-[ 	]*[a-f0-9]+:	48 1b ca             	sbb.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 1b ca             	sbb.s  rcx,rdx
 [ 	]*[a-f0-9]+:	28 d1                	sub    cl,dl
-[ 	]*[a-f0-9]+:	2a ca                	sub.s cl,dl
+[ 	]*[a-f0-9]+:	2a ca                	sub.s  cl,dl
 [ 	]*[a-f0-9]+:	66 29 d1             	sub    cx,dx
-[ 	]*[a-f0-9]+:	66 2b ca             	sub.s cx,dx
+[ 	]*[a-f0-9]+:	66 2b ca             	sub.s  cx,dx
 [ 	]*[a-f0-9]+:	29 d1                	sub    ecx,edx
-[ 	]*[a-f0-9]+:	2b ca                	sub.s ecx,edx
+[ 	]*[a-f0-9]+:	2b ca                	sub.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 29 d1             	sub    rcx,rdx
-[ 	]*[a-f0-9]+:	48 2b ca             	sub.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 2b ca             	sub.s  rcx,rdx
 [ 	]*[a-f0-9]+:	30 d1                	xor    cl,dl
-[ 	]*[a-f0-9]+:	32 ca                	xor.s cl,dl
+[ 	]*[a-f0-9]+:	32 ca                	xor.s  cl,dl
 [ 	]*[a-f0-9]+:	66 31 d1             	xor    cx,dx
-[ 	]*[a-f0-9]+:	66 33 ca             	xor.s cx,dx
+[ 	]*[a-f0-9]+:	66 33 ca             	xor.s  cx,dx
 [ 	]*[a-f0-9]+:	31 d1                	xor    ecx,edx
-[ 	]*[a-f0-9]+:	33 ca                	xor.s ecx,edx
+[ 	]*[a-f0-9]+:	33 ca                	xor.s  ecx,edx
 [ 	]*[a-f0-9]+:	48 31 d1             	xor    rcx,rdx
-[ 	]*[a-f0-9]+:	48 33 ca             	xor.s rcx,rdx
+[ 	]*[a-f0-9]+:	48 33 ca             	xor.s  rcx,rdx
 [ 	]*[a-f0-9]+:	c5 fd 28 f4          	vmovapd ymm6,ymm4
 [ 	]*[a-f0-9]+:	c5 fd 29 e6          	vmovapd.s ymm6,ymm4
 [ 	]*[a-f0-9]+:	c5 fc 28 f4          	vmovaps ymm6,ymm4
diff --git a/gas/testsuite/gas/i386/x86-64-sse2avx-opts.d b/gas/testsuite/gas/i386/x86-64-sse2avx-opts.d
index 7fe4b8ecaa..3a2362d0e5 100644
--- a/gas/testsuite/gas/i386/x86-64-sse2avx-opts.d
+++ b/gas/testsuite/gas/i386/x86-64-sse2avx-opts.d
@@ -90,21 +90,21 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	48 89 d1             	movq   %rdx,%rcx
 [ 	]*[a-f0-9]+:	48 8b ca             	movq.s %rdx,%rcx
 [ 	]*[a-f0-9]+:	08 d1                	orb    %dl,%cl
-[ 	]*[a-f0-9]+:	0a ca                	orb.s %dl,%cl
+[ 	]*[a-f0-9]+:	0a ca                	orb.s  %dl,%cl
 [ 	]*[a-f0-9]+:	66 09 d1             	orw    %dx,%cx
-[ 	]*[a-f0-9]+:	66 0b ca             	orw.s %dx,%cx
+[ 	]*[a-f0-9]+:	66 0b ca             	orw.s  %dx,%cx
 [ 	]*[a-f0-9]+:	09 d1                	orl    %edx,%ecx
-[ 	]*[a-f0-9]+:	0b ca                	orl.s %edx,%ecx
+[ 	]*[a-f0-9]+:	0b ca                	orl.s  %edx,%ecx
 [ 	]*[a-f0-9]+:	08 d1                	orb    %dl,%cl
-[ 	]*[a-f0-9]+:	0a ca                	orb.s %dl,%cl
+[ 	]*[a-f0-9]+:	0a ca                	orb.s  %dl,%cl
 [ 	]*[a-f0-9]+:	66 09 d1             	orw    %dx,%cx
-[ 	]*[a-f0-9]+:	66 0b ca             	orw.s %dx,%cx
+[ 	]*[a-f0-9]+:	66 0b ca             	orw.s  %dx,%cx
 [ 	]*[a-f0-9]+:	09 d1                	orl    %edx,%ecx
-[ 	]*[a-f0-9]+:	0b ca                	orl.s %edx,%ecx
+[ 	]*[a-f0-9]+:	0b ca                	orl.s  %edx,%ecx
 [ 	]*[a-f0-9]+:	48 09 d1             	orq    %rdx,%rcx
-[ 	]*[a-f0-9]+:	48 0b ca             	orq.s %rdx,%rcx
+[ 	]*[a-f0-9]+:	48 0b ca             	orq.s  %rdx,%rcx
 [ 	]*[a-f0-9]+:	48 09 d1             	orq    %rdx,%rcx
-[ 	]*[a-f0-9]+:	48 0b ca             	orq.s %rdx,%rcx
+[ 	]*[a-f0-9]+:	48 0b ca             	orq.s  %rdx,%rcx
 [ 	]*[a-f0-9]+:	18 d1                	sbbb   %dl,%cl
 [ 	]*[a-f0-9]+:	1a ca                	sbbb.s %dl,%cl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbbw   %dx,%cx
@@ -244,13 +244,13 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	48 89 d1             	movq   %rdx,%rcx
 [ 	]*[a-f0-9]+:	48 8b ca             	movq.s %rdx,%rcx
 [ 	]*[a-f0-9]+:	08 d1                	orb    %dl,%cl
-[ 	]*[a-f0-9]+:	0a ca                	orb.s %dl,%cl
+[ 	]*[a-f0-9]+:	0a ca                	orb.s  %dl,%cl
 [ 	]*[a-f0-9]+:	66 09 d1             	orw    %dx,%cx
-[ 	]*[a-f0-9]+:	66 0b ca             	orw.s %dx,%cx
+[ 	]*[a-f0-9]+:	66 0b ca             	orw.s  %dx,%cx
 [ 	]*[a-f0-9]+:	09 d1                	orl    %edx,%ecx
-[ 	]*[a-f0-9]+:	0b ca                	orl.s %edx,%ecx
+[ 	]*[a-f0-9]+:	0b ca                	orl.s  %edx,%ecx
 [ 	]*[a-f0-9]+:	48 09 d1             	orq    %rdx,%rcx
-[ 	]*[a-f0-9]+:	48 0b ca             	orq.s %rdx,%rcx
+[ 	]*[a-f0-9]+:	48 0b ca             	orq.s  %rdx,%rcx
 [ 	]*[a-f0-9]+:	18 d1                	sbbb   %dl,%cl
 [ 	]*[a-f0-9]+:	1a ca                	sbbb.s %dl,%cl
 [ 	]*[a-f0-9]+:	66 19 d1             	sbbw   %dx,%cx
diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 926f776de8..de3f245cb5 100644
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -10307,6 +10307,7 @@ swap_operand (void)
 {
   mnemonicendp[0] = '.';
   mnemonicendp[1] = 's';
+  mnemonicendp[2] = '\0';
   mnemonicendp += 2;
 }
 
-- 
2.27.0


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Cleanup mnemonicendp in swap_operand()
  2021-12-17 23:26 [PATCH] Cleanup mnemonicendp in swap_operand() vladimir.mezentsev
@ 2021-12-17 23:37 ` H.J. Lu
       [not found]   ` <2e2351bf-3737-7520-ed87-3ffacc0eb8f7@oracle.com>
  0 siblings, 1 reply; 3+ messages in thread
From: H.J. Lu @ 2021-12-17 23:37 UTC (permalink / raw)
  To: vladimir.mezentsev; +Cc: Binutils

On Fri, Dec 17, 2021 at 3:27 PM Vladimir Mezentsev via Binutils
<binutils@sourceware.org> wrote:
>
> From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
>
> Tested on x86_64-pc-linux-gnu.
>
> opcodes/ChangeLog:
> 2021-12-17 Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
>
>         * opcodes/i386-dis.c (swap_operand): Cleanup mnemonicendp

This description isn't very clear.  How about "Terminate mnemonicendp"?

OK with this change.

>
> gas/ChangeLog:
> 2021-12-17 Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
>
>         * gas/testsuite/gas/i386/opts-intel.d: Updated expected disassembly
>         * gas/testsuite/gas/i386/opts.d: Likewise.
>         * gas/testsuite/gas/i386/sse2avx-opts-intel.d: Likewise.
>         * gas/testsuite/gas/i386/sse2avx-opts.d: Likewise.
>         * gas/testsuite/gas/i386/x86-64-opts-intel.d: Likewise.
>         * gas/testsuite/gas/i386/x86-64-opts.d: Likewise.
>         * gas/testsuite/gas/i386/x86-64-sse2avx-opts-intel.d: Likewise.
>         * gas/testsuite/gas/i386/x86-64-sse2avx-opts.d: Likewise.

These ChangeLog entries are good as part of the git commit message.
Please don't add them to ChangeLog files.

> ---
>  gas/testsuite/gas/i386/opts-intel.d           | 162 ++++++-------
>  gas/testsuite/gas/i386/opts.d                 |  18 +-
>  gas/testsuite/gas/i386/sse2avx-opts-intel.d   | 162 ++++++-------
>  gas/testsuite/gas/i386/sse2avx-opts.d         |  18 +-
>  gas/testsuite/gas/i386/x86-64-opts-intel.d    | 216 +++++++++---------
>  gas/testsuite/gas/i386/x86-64-opts.d          |  24 +-
>  .../gas/i386/x86-64-sse2avx-opts-intel.d      | 216 +++++++++---------
>  gas/testsuite/gas/i386/x86-64-sse2avx-opts.d  |  24 +-
>  opcodes/i386-dis.c                            |   1 +
>  9 files changed, 421 insertions(+), 420 deletions(-)
>
> diff --git a/gas/testsuite/gas/i386/opts-intel.d b/gas/testsuite/gas/i386/opts-intel.d
> index 4c546eeda3..4172e93c39 100644
> --- a/gas/testsuite/gas/i386/opts-intel.d
> +++ b/gas/testsuite/gas/i386/opts-intel.d
> @@ -9,113 +9,113 @@ Disassembly of section .text:
>
>  0+ <_start>:
>  [      ]*[a-f0-9]+:    00 d1                   add    cl,dl
> -[      ]*[a-f0-9]+:    02 ca                   add.s cl,dl
> +[      ]*[a-f0-9]+:    02 ca                   add.s  cl,dl
>  [      ]*[a-f0-9]+:    66 01 d1                add    cx,dx
> -[      ]*[a-f0-9]+:    66 03 ca                add.s cx,dx
> +[      ]*[a-f0-9]+:    66 03 ca                add.s  cx,dx
>  [      ]*[a-f0-9]+:    01 d1                   add    ecx,edx
> -[      ]*[a-f0-9]+:    03 ca                   add.s ecx,edx
> +[      ]*[a-f0-9]+:    03 ca                   add.s  ecx,edx
>  [      ]*[a-f0-9]+:    00 d1                   add    cl,dl
> -[      ]*[a-f0-9]+:    02 ca                   add.s cl,dl
> +[      ]*[a-f0-9]+:    02 ca                   add.s  cl,dl
>  [      ]*[a-f0-9]+:    66 01 d1                add    cx,dx
> -[      ]*[a-f0-9]+:    66 03 ca                add.s cx,dx
> +[      ]*[a-f0-9]+:    66 03 ca                add.s  cx,dx
>  [      ]*[a-f0-9]+:    01 d1                   add    ecx,edx
> -[      ]*[a-f0-9]+:    03 ca                   add.s ecx,edx
> +[      ]*[a-f0-9]+:    03 ca                   add.s  ecx,edx
>  [      ]*[a-f0-9]+:    10 d1                   adc    cl,dl
> -[      ]*[a-f0-9]+:    12 ca                   adc.s cl,dl
> +[      ]*[a-f0-9]+:    12 ca                   adc.s  cl,dl
>  [      ]*[a-f0-9]+:    66 11 d1                adc    cx,dx
> -[      ]*[a-f0-9]+:    66 13 ca                adc.s cx,dx
> +[      ]*[a-f0-9]+:    66 13 ca                adc.s  cx,dx
>  [      ]*[a-f0-9]+:    11 d1                   adc    ecx,edx
> -[      ]*[a-f0-9]+:    13 ca                   adc.s ecx,edx
> +[      ]*[a-f0-9]+:    13 ca                   adc.s  ecx,edx
>  [      ]*[a-f0-9]+:    10 d1                   adc    cl,dl
> -[      ]*[a-f0-9]+:    12 ca                   adc.s cl,dl
> +[      ]*[a-f0-9]+:    12 ca                   adc.s  cl,dl
>  [      ]*[a-f0-9]+:    66 11 d1                adc    cx,dx
> -[      ]*[a-f0-9]+:    66 13 ca                adc.s cx,dx
> +[      ]*[a-f0-9]+:    66 13 ca                adc.s  cx,dx
>  [      ]*[a-f0-9]+:    11 d1                   adc    ecx,edx
> -[      ]*[a-f0-9]+:    13 ca                   adc.s ecx,edx
> +[      ]*[a-f0-9]+:    13 ca                   adc.s  ecx,edx
>  [      ]*[a-f0-9]+:    20 d1                   and    cl,dl
> -[      ]*[a-f0-9]+:    22 ca                   and.s cl,dl
> +[      ]*[a-f0-9]+:    22 ca                   and.s  cl,dl
>  [      ]*[a-f0-9]+:    66 21 d1                and    cx,dx
> -[      ]*[a-f0-9]+:    66 23 ca                and.s cx,dx
> +[      ]*[a-f0-9]+:    66 23 ca                and.s  cx,dx
>  [      ]*[a-f0-9]+:    21 d1                   and    ecx,edx
> -[      ]*[a-f0-9]+:    23 ca                   and.s ecx,edx
> +[      ]*[a-f0-9]+:    23 ca                   and.s  ecx,edx
>  [      ]*[a-f0-9]+:    20 d1                   and    cl,dl
> -[      ]*[a-f0-9]+:    22 ca                   and.s cl,dl
> +[      ]*[a-f0-9]+:    22 ca                   and.s  cl,dl
>  [      ]*[a-f0-9]+:    66 21 d1                and    cx,dx
> -[      ]*[a-f0-9]+:    66 23 ca                and.s cx,dx
> +[      ]*[a-f0-9]+:    66 23 ca                and.s  cx,dx
>  [      ]*[a-f0-9]+:    21 d1                   and    ecx,edx
> -[      ]*[a-f0-9]+:    23 ca                   and.s ecx,edx
> +[      ]*[a-f0-9]+:    23 ca                   and.s  ecx,edx
>  [      ]*[a-f0-9]+:    38 d1                   cmp    cl,dl
> -[      ]*[a-f0-9]+:    3a ca                   cmp.s cl,dl
> +[      ]*[a-f0-9]+:    3a ca                   cmp.s  cl,dl
>  [      ]*[a-f0-9]+:    66 39 d1                cmp    cx,dx
> -[      ]*[a-f0-9]+:    66 3b ca                cmp.s cx,dx
> +[      ]*[a-f0-9]+:    66 3b ca                cmp.s  cx,dx
>  [      ]*[a-f0-9]+:    39 d1                   cmp    ecx,edx
> -[      ]*[a-f0-9]+:    3b ca                   cmp.s ecx,edx
> +[      ]*[a-f0-9]+:    3b ca                   cmp.s  ecx,edx
>  [      ]*[a-f0-9]+:    38 d1                   cmp    cl,dl
> -[      ]*[a-f0-9]+:    3a ca                   cmp.s cl,dl
> +[      ]*[a-f0-9]+:    3a ca                   cmp.s  cl,dl
>  [      ]*[a-f0-9]+:    66 39 d1                cmp    cx,dx
> -[      ]*[a-f0-9]+:    66 3b ca                cmp.s cx,dx
> +[      ]*[a-f0-9]+:    66 3b ca                cmp.s  cx,dx
>  [      ]*[a-f0-9]+:    39 d1                   cmp    ecx,edx
> -[      ]*[a-f0-9]+:    3b ca                   cmp.s ecx,edx
> +[      ]*[a-f0-9]+:    3b ca                   cmp.s  ecx,edx
>  [      ]*[a-f0-9]+:    88 d1                   mov    cl,dl
> -[      ]*[a-f0-9]+:    8a ca                   mov.s cl,dl
> +[      ]*[a-f0-9]+:    8a ca                   mov.s  cl,dl
>  [      ]*[a-f0-9]+:    66 89 d1                mov    cx,dx
> -[      ]*[a-f0-9]+:    66 8b ca                mov.s cx,dx
> +[      ]*[a-f0-9]+:    66 8b ca                mov.s  cx,dx
>  [      ]*[a-f0-9]+:    89 d1                   mov    ecx,edx
> -[      ]*[a-f0-9]+:    8b ca                   mov.s ecx,edx
> +[      ]*[a-f0-9]+:    8b ca                   mov.s  ecx,edx
>  [      ]*[a-f0-9]+:    88 d1                   mov    cl,dl
> -[      ]*[a-f0-9]+:    8a ca                   mov.s cl,dl
> +[      ]*[a-f0-9]+:    8a ca                   mov.s  cl,dl
>  [      ]*[a-f0-9]+:    66 89 d1                mov    cx,dx
> -[      ]*[a-f0-9]+:    66 8b ca                mov.s cx,dx
> +[      ]*[a-f0-9]+:    66 8b ca                mov.s  cx,dx
>  [      ]*[a-f0-9]+:    89 d1                   mov    ecx,edx
> -[      ]*[a-f0-9]+:    8b ca                   mov.s ecx,edx
> +[      ]*[a-f0-9]+:    8b ca                   mov.s  ecx,edx
>  [      ]*[a-f0-9]+:    08 d1                   or     cl,dl
> -[      ]*[a-f0-9]+:    0a ca                   or.s cl,dl
> +[      ]*[a-f0-9]+:    0a ca                   or.s   cl,dl
>  [      ]*[a-f0-9]+:    66 09 d1                or     cx,dx
> -[      ]*[a-f0-9]+:    66 0b ca                or.s cx,dx
> +[      ]*[a-f0-9]+:    66 0b ca                or.s   cx,dx
>  [      ]*[a-f0-9]+:    09 d1                   or     ecx,edx
> -[      ]*[a-f0-9]+:    0b ca                   or.s ecx,edx
> +[      ]*[a-f0-9]+:    0b ca                   or.s   ecx,edx
>  [      ]*[a-f0-9]+:    08 d1                   or     cl,dl
> -[      ]*[a-f0-9]+:    0a ca                   or.s cl,dl
> +[      ]*[a-f0-9]+:    0a ca                   or.s   cl,dl
>  [      ]*[a-f0-9]+:    66 09 d1                or     cx,dx
> -[      ]*[a-f0-9]+:    66 0b ca                or.s cx,dx
> +[      ]*[a-f0-9]+:    66 0b ca                or.s   cx,dx
>  [      ]*[a-f0-9]+:    09 d1                   or     ecx,edx
> -[      ]*[a-f0-9]+:    0b ca                   or.s ecx,edx
> +[      ]*[a-f0-9]+:    0b ca                   or.s   ecx,edx
>  [      ]*[a-f0-9]+:    18 d1                   sbb    cl,dl
> -[      ]*[a-f0-9]+:    1a ca                   sbb.s cl,dl
> +[      ]*[a-f0-9]+:    1a ca                   sbb.s  cl,dl
>  [      ]*[a-f0-9]+:    66 19 d1                sbb    cx,dx
> -[      ]*[a-f0-9]+:    66 1b ca                sbb.s cx,dx
> +[      ]*[a-f0-9]+:    66 1b ca                sbb.s  cx,dx
>  [      ]*[a-f0-9]+:    19 d1                   sbb    ecx,edx
> -[      ]*[a-f0-9]+:    1b ca                   sbb.s ecx,edx
> +[      ]*[a-f0-9]+:    1b ca                   sbb.s  ecx,edx
>  [      ]*[a-f0-9]+:    18 d1                   sbb    cl,dl
> -[      ]*[a-f0-9]+:    1a ca                   sbb.s cl,dl
> +[      ]*[a-f0-9]+:    1a ca                   sbb.s  cl,dl
>  [      ]*[a-f0-9]+:    66 19 d1                sbb    cx,dx
> -[      ]*[a-f0-9]+:    66 1b ca                sbb.s cx,dx
> +[      ]*[a-f0-9]+:    66 1b ca                sbb.s  cx,dx
>  [      ]*[a-f0-9]+:    19 d1                   sbb    ecx,edx
> -[      ]*[a-f0-9]+:    1b ca                   sbb.s ecx,edx
> +[      ]*[a-f0-9]+:    1b ca                   sbb.s  ecx,edx
>  [      ]*[a-f0-9]+:    28 d1                   sub    cl,dl
> -[      ]*[a-f0-9]+:    2a ca                   sub.s cl,dl
> +[      ]*[a-f0-9]+:    2a ca                   sub.s  cl,dl
>  [      ]*[a-f0-9]+:    66 29 d1                sub    cx,dx
> -[      ]*[a-f0-9]+:    66 2b ca                sub.s cx,dx
> +[      ]*[a-f0-9]+:    66 2b ca                sub.s  cx,dx
>  [      ]*[a-f0-9]+:    29 d1                   sub    ecx,edx
> -[      ]*[a-f0-9]+:    2b ca                   sub.s ecx,edx
> +[      ]*[a-f0-9]+:    2b ca                   sub.s  ecx,edx
>  [      ]*[a-f0-9]+:    28 d1                   sub    cl,dl
> -[      ]*[a-f0-9]+:    2a ca                   sub.s cl,dl
> +[      ]*[a-f0-9]+:    2a ca                   sub.s  cl,dl
>  [      ]*[a-f0-9]+:    66 29 d1                sub    cx,dx
> -[      ]*[a-f0-9]+:    66 2b ca                sub.s cx,dx
> +[      ]*[a-f0-9]+:    66 2b ca                sub.s  cx,dx
>  [      ]*[a-f0-9]+:    29 d1                   sub    ecx,edx
> -[      ]*[a-f0-9]+:    2b ca                   sub.s ecx,edx
> +[      ]*[a-f0-9]+:    2b ca                   sub.s  ecx,edx
>  [      ]*[a-f0-9]+:    30 d1                   xor    cl,dl
> -[      ]*[a-f0-9]+:    32 ca                   xor.s cl,dl
> +[      ]*[a-f0-9]+:    32 ca                   xor.s  cl,dl
>  [      ]*[a-f0-9]+:    66 31 d1                xor    cx,dx
> -[      ]*[a-f0-9]+:    66 33 ca                xor.s cx,dx
> +[      ]*[a-f0-9]+:    66 33 ca                xor.s  cx,dx
>  [      ]*[a-f0-9]+:    31 d1                   xor    ecx,edx
> -[      ]*[a-f0-9]+:    33 ca                   xor.s ecx,edx
> +[      ]*[a-f0-9]+:    33 ca                   xor.s  ecx,edx
>  [      ]*[a-f0-9]+:    30 d1                   xor    cl,dl
> -[      ]*[a-f0-9]+:    32 ca                   xor.s cl,dl
> +[      ]*[a-f0-9]+:    32 ca                   xor.s  cl,dl
>  [      ]*[a-f0-9]+:    66 31 d1                xor    cx,dx
> -[      ]*[a-f0-9]+:    66 33 ca                xor.s cx,dx
> +[      ]*[a-f0-9]+:    66 33 ca                xor.s  cx,dx
>  [      ]*[a-f0-9]+:    31 d1                   xor    ecx,edx
> -[      ]*[a-f0-9]+:    33 ca                   xor.s ecx,edx
> +[      ]*[a-f0-9]+:    33 ca                   xor.s  ecx,edx
>  [      ]*[a-f0-9]+:    c5 fd 28 f4             vmovapd ymm6,ymm4
>  [      ]*[a-f0-9]+:    c5 fd 29 e6             vmovapd.s ymm6,ymm4
>  [      ]*[a-f0-9]+:    c5 fc 28 f4             vmovaps ymm6,ymm4
> @@ -169,59 +169,59 @@ Disassembly of section .text:
>  [      ]*[a-f0-9]+:    66 0f 1a d1             bndmov bnd2,bnd1
>  [      ]*[a-f0-9]+:    66 0f 1b ca             bndmov.s bnd2,bnd1
>  [      ]*[a-f0-9]+:    00 d1                   add    cl,dl
> -[      ]*[a-f0-9]+:    02 ca                   add.s cl,dl
> +[      ]*[a-f0-9]+:    02 ca                   add.s  cl,dl
>  [      ]*[a-f0-9]+:    66 01 d1                add    cx,dx
> -[      ]*[a-f0-9]+:    66 03 ca                add.s cx,dx
> +[      ]*[a-f0-9]+:    66 03 ca                add.s  cx,dx
>  [      ]*[a-f0-9]+:    01 d1                   add    ecx,edx
> -[      ]*[a-f0-9]+:    03 ca                   add.s ecx,edx
> +[      ]*[a-f0-9]+:    03 ca                   add.s  ecx,edx
>  [      ]*[a-f0-9]+:    10 d1                   adc    cl,dl
> -[      ]*[a-f0-9]+:    12 ca                   adc.s cl,dl
> +[      ]*[a-f0-9]+:    12 ca                   adc.s  cl,dl
>  [      ]*[a-f0-9]+:    66 11 d1                adc    cx,dx
> -[      ]*[a-f0-9]+:    66 13 ca                adc.s cx,dx
> +[      ]*[a-f0-9]+:    66 13 ca                adc.s  cx,dx
>  [      ]*[a-f0-9]+:    11 d1                   adc    ecx,edx
> -[      ]*[a-f0-9]+:    13 ca                   adc.s ecx,edx
> +[      ]*[a-f0-9]+:    13 ca                   adc.s  ecx,edx
>  [      ]*[a-f0-9]+:    20 d1                   and    cl,dl
> -[      ]*[a-f0-9]+:    22 ca                   and.s cl,dl
> +[      ]*[a-f0-9]+:    22 ca                   and.s  cl,dl
>  [      ]*[a-f0-9]+:    66 21 d1                and    cx,dx
> -[      ]*[a-f0-9]+:    66 23 ca                and.s cx,dx
> +[      ]*[a-f0-9]+:    66 23 ca                and.s  cx,dx
>  [      ]*[a-f0-9]+:    21 d1                   and    ecx,edx
> -[      ]*[a-f0-9]+:    23 ca                   and.s ecx,edx
> +[      ]*[a-f0-9]+:    23 ca                   and.s  ecx,edx
>  [      ]*[a-f0-9]+:    38 d1                   cmp    cl,dl
> -[      ]*[a-f0-9]+:    3a ca                   cmp.s cl,dl
> +[      ]*[a-f0-9]+:    3a ca                   cmp.s  cl,dl
>  [      ]*[a-f0-9]+:    66 39 d1                cmp    cx,dx
> -[      ]*[a-f0-9]+:    66 3b ca                cmp.s cx,dx
> +[      ]*[a-f0-9]+:    66 3b ca                cmp.s  cx,dx
>  [      ]*[a-f0-9]+:    39 d1                   cmp    ecx,edx
> -[      ]*[a-f0-9]+:    3b ca                   cmp.s ecx,edx
> +[      ]*[a-f0-9]+:    3b ca                   cmp.s  ecx,edx
>  [      ]*[a-f0-9]+:    88 d1                   mov    cl,dl
> -[      ]*[a-f0-9]+:    8a ca                   mov.s cl,dl
> +[      ]*[a-f0-9]+:    8a ca                   mov.s  cl,dl
>  [      ]*[a-f0-9]+:    66 89 d1                mov    cx,dx
> -[      ]*[a-f0-9]+:    66 8b ca                mov.s cx,dx
> +[      ]*[a-f0-9]+:    66 8b ca                mov.s  cx,dx
>  [      ]*[a-f0-9]+:    89 d1                   mov    ecx,edx
> -[      ]*[a-f0-9]+:    8b ca                   mov.s ecx,edx
> +[      ]*[a-f0-9]+:    8b ca                   mov.s  ecx,edx
>  [      ]*[a-f0-9]+:    08 d1                   or     cl,dl
> -[      ]*[a-f0-9]+:    0a ca                   or.s cl,dl
> +[      ]*[a-f0-9]+:    0a ca                   or.s   cl,dl
>  [      ]*[a-f0-9]+:    66 09 d1                or     cx,dx
> -[      ]*[a-f0-9]+:    66 0b ca                or.s cx,dx
> +[      ]*[a-f0-9]+:    66 0b ca                or.s   cx,dx
>  [      ]*[a-f0-9]+:    09 d1                   or     ecx,edx
> -[      ]*[a-f0-9]+:    0b ca                   or.s ecx,edx
> +[      ]*[a-f0-9]+:    0b ca                   or.s   ecx,edx
>  [      ]*[a-f0-9]+:    18 d1                   sbb    cl,dl
> -[      ]*[a-f0-9]+:    1a ca                   sbb.s cl,dl
> +[      ]*[a-f0-9]+:    1a ca                   sbb.s  cl,dl
>  [      ]*[a-f0-9]+:    66 19 d1                sbb    cx,dx
> -[      ]*[a-f0-9]+:    66 1b ca                sbb.s cx,dx
> +[      ]*[a-f0-9]+:    66 1b ca                sbb.s  cx,dx
>  [      ]*[a-f0-9]+:    19 d1                   sbb    ecx,edx
> -[      ]*[a-f0-9]+:    1b ca                   sbb.s ecx,edx
> +[      ]*[a-f0-9]+:    1b ca                   sbb.s  ecx,edx
>  [      ]*[a-f0-9]+:    28 d1                   sub    cl,dl
> -[      ]*[a-f0-9]+:    2a ca                   sub.s cl,dl
> +[      ]*[a-f0-9]+:    2a ca                   sub.s  cl,dl
>  [      ]*[a-f0-9]+:    66 29 d1                sub    cx,dx
> -[      ]*[a-f0-9]+:    66 2b ca                sub.s cx,dx
> +[      ]*[a-f0-9]+:    66 2b ca                sub.s  cx,dx
>  [      ]*[a-f0-9]+:    29 d1                   sub    ecx,edx
> -[      ]*[a-f0-9]+:    2b ca                   sub.s ecx,edx
> +[      ]*[a-f0-9]+:    2b ca                   sub.s  ecx,edx
>  [      ]*[a-f0-9]+:    30 d1                   xor    cl,dl
> -[      ]*[a-f0-9]+:    32 ca                   xor.s cl,dl
> +[      ]*[a-f0-9]+:    32 ca                   xor.s  cl,dl
>  [      ]*[a-f0-9]+:    66 31 d1                xor    cx,dx
> -[      ]*[a-f0-9]+:    66 33 ca                xor.s cx,dx
> +[      ]*[a-f0-9]+:    66 33 ca                xor.s  cx,dx
>  [      ]*[a-f0-9]+:    31 d1                   xor    ecx,edx
> -[      ]*[a-f0-9]+:    33 ca                   xor.s ecx,edx
> +[      ]*[a-f0-9]+:    33 ca                   xor.s  ecx,edx
>  [      ]*[a-f0-9]+:    c5 fd 28 f4             vmovapd ymm6,ymm4
>  [      ]*[a-f0-9]+:    c5 fd 29 e6             vmovapd.s ymm6,ymm4
>  [      ]*[a-f0-9]+:    c5 fc 28 f4             vmovaps ymm6,ymm4
> diff --git a/gas/testsuite/gas/i386/opts.d b/gas/testsuite/gas/i386/opts.d
> index af6cdf06cd..73d2a6ef54 100644
> --- a/gas/testsuite/gas/i386/opts.d
> +++ b/gas/testsuite/gas/i386/opts.d
> @@ -68,17 +68,17 @@ Disassembly of section .text:
>  [      ]*[a-f0-9]+:    89 d1                   movl   %edx,%ecx
>  [      ]*[a-f0-9]+:    8b ca                   movl.s %edx,%ecx
>  [      ]*[a-f0-9]+:    08 d1                   orb    %dl,%cl
> -[      ]*[a-f0-9]+:    0a ca                   orb.s %dl,%cl
> +[      ]*[a-f0-9]+:    0a ca                   orb.s  %dl,%cl
>  [      ]*[a-f0-9]+:    66 09 d1                orw    %dx,%cx
> -[      ]*[a-f0-9]+:    66 0b ca                orw.s %dx,%cx
> +[      ]*[a-f0-9]+:    66 0b ca                orw.s  %dx,%cx
>  [      ]*[a-f0-9]+:    09 d1                   orl    %edx,%ecx
> -[      ]*[a-f0-9]+:    0b ca                   orl.s %edx,%ecx
> +[      ]*[a-f0-9]+:    0b ca                   orl.s  %edx,%ecx
>  [      ]*[a-f0-9]+:    08 d1                   orb    %dl,%cl
> -[      ]*[a-f0-9]+:    0a ca                   orb.s %dl,%cl
> +[      ]*[a-f0-9]+:    0a ca                   orb.s  %dl,%cl
>  [      ]*[a-f0-9]+:    66 09 d1                orw    %dx,%cx
> -[      ]*[a-f0-9]+:    66 0b ca                orw.s %dx,%cx
> +[      ]*[a-f0-9]+:    66 0b ca                orw.s  %dx,%cx
>  [      ]*[a-f0-9]+:    09 d1                   orl    %edx,%ecx
> -[      ]*[a-f0-9]+:    0b ca                   orl.s %edx,%ecx
> +[      ]*[a-f0-9]+:    0b ca                   orl.s  %edx,%ecx
>  [      ]*[a-f0-9]+:    18 d1                   sbbb   %dl,%cl
>  [      ]*[a-f0-9]+:    1a ca                   sbbb.s %dl,%cl
>  [      ]*[a-f0-9]+:    66 19 d1                sbbw   %dx,%cx
> @@ -198,11 +198,11 @@ Disassembly of section .text:
>  [      ]*[a-f0-9]+:    89 d1                   movl   %edx,%ecx
>  [      ]*[a-f0-9]+:    8b ca                   movl.s %edx,%ecx
>  [      ]*[a-f0-9]+:    08 d1                   orb    %dl,%cl
> -[      ]*[a-f0-9]+:    0a ca                   orb.s %dl,%cl
> +[      ]*[a-f0-9]+:    0a ca                   orb.s  %dl,%cl
>  [      ]*[a-f0-9]+:    66 09 d1                orw    %dx,%cx
> -[      ]*[a-f0-9]+:    66 0b ca                orw.s %dx,%cx
> +[      ]*[a-f0-9]+:    66 0b ca                orw.s  %dx,%cx
>  [      ]*[a-f0-9]+:    09 d1                   orl    %edx,%ecx
> -[      ]*[a-f0-9]+:    0b ca                   orl.s %edx,%ecx
> +[      ]*[a-f0-9]+:    0b ca                   orl.s  %edx,%ecx
>  [      ]*[a-f0-9]+:    18 d1                   sbbb   %dl,%cl
>  [      ]*[a-f0-9]+:    1a ca                   sbbb.s %dl,%cl
>  [      ]*[a-f0-9]+:    66 19 d1                sbbw   %dx,%cx
> diff --git a/gas/testsuite/gas/i386/sse2avx-opts-intel.d b/gas/testsuite/gas/i386/sse2avx-opts-intel.d
> index 3e48cf83a4..6f9d30dabe 100644
> --- a/gas/testsuite/gas/i386/sse2avx-opts-intel.d
> +++ b/gas/testsuite/gas/i386/sse2avx-opts-intel.d
> @@ -10,113 +10,113 @@ Disassembly of section .text:
>
>  0+ <_start>:
>  [      ]*[a-f0-9]+:    00 d1                   add    cl,dl
> -[      ]*[a-f0-9]+:    02 ca                   add.s cl,dl
> +[      ]*[a-f0-9]+:    02 ca                   add.s  cl,dl
>  [      ]*[a-f0-9]+:    66 01 d1                add    cx,dx
> -[      ]*[a-f0-9]+:    66 03 ca                add.s cx,dx
> +[      ]*[a-f0-9]+:    66 03 ca                add.s  cx,dx
>  [      ]*[a-f0-9]+:    01 d1                   add    ecx,edx
> -[      ]*[a-f0-9]+:    03 ca                   add.s ecx,edx
> +[      ]*[a-f0-9]+:    03 ca                   add.s  ecx,edx
>  [      ]*[a-f0-9]+:    00 d1                   add    cl,dl
> -[      ]*[a-f0-9]+:    02 ca                   add.s cl,dl
> +[      ]*[a-f0-9]+:    02 ca                   add.s  cl,dl
>  [      ]*[a-f0-9]+:    66 01 d1                add    cx,dx
> -[      ]*[a-f0-9]+:    66 03 ca                add.s cx,dx
> +[      ]*[a-f0-9]+:    66 03 ca                add.s  cx,dx
>  [      ]*[a-f0-9]+:    01 d1                   add    ecx,edx
> -[      ]*[a-f0-9]+:    03 ca                   add.s ecx,edx
> +[      ]*[a-f0-9]+:    03 ca                   add.s  ecx,edx
>  [      ]*[a-f0-9]+:    10 d1                   adc    cl,dl
> -[      ]*[a-f0-9]+:    12 ca                   adc.s cl,dl
> +[      ]*[a-f0-9]+:    12 ca                   adc.s  cl,dl
>  [      ]*[a-f0-9]+:    66 11 d1                adc    cx,dx
> -[      ]*[a-f0-9]+:    66 13 ca                adc.s cx,dx
> +[      ]*[a-f0-9]+:    66 13 ca                adc.s  cx,dx
>  [      ]*[a-f0-9]+:    11 d1                   adc    ecx,edx
> -[      ]*[a-f0-9]+:    13 ca                   adc.s ecx,edx
> +[      ]*[a-f0-9]+:    13 ca                   adc.s  ecx,edx
>  [      ]*[a-f0-9]+:    10 d1                   adc    cl,dl
> -[      ]*[a-f0-9]+:    12 ca                   adc.s cl,dl
> +[      ]*[a-f0-9]+:    12 ca                   adc.s  cl,dl
>  [      ]*[a-f0-9]+:    66 11 d1                adc    cx,dx
> -[      ]*[a-f0-9]+:    66 13 ca                adc.s cx,dx
> +[      ]*[a-f0-9]+:    66 13 ca                adc.s  cx,dx
>  [      ]*[a-f0-9]+:    11 d1                   adc    ecx,edx
> -[      ]*[a-f0-9]+:    13 ca                   adc.s ecx,edx
> +[      ]*[a-f0-9]+:    13 ca                   adc.s  ecx,edx
>  [      ]*[a-f0-9]+:    20 d1                   and    cl,dl
> -[      ]*[a-f0-9]+:    22 ca                   and.s cl,dl
> +[      ]*[a-f0-9]+:    22 ca                   and.s  cl,dl
>  [      ]*[a-f0-9]+:    66 21 d1                and    cx,dx
> -[      ]*[a-f0-9]+:    66 23 ca                and.s cx,dx
> +[      ]*[a-f0-9]+:    66 23 ca                and.s  cx,dx
>  [      ]*[a-f0-9]+:    21 d1                   and    ecx,edx
> -[      ]*[a-f0-9]+:    23 ca                   and.s ecx,edx
> +[      ]*[a-f0-9]+:    23 ca                   and.s  ecx,edx
>  [      ]*[a-f0-9]+:    20 d1                   and    cl,dl
> -[      ]*[a-f0-9]+:    22 ca                   and.s cl,dl
> +[      ]*[a-f0-9]+:    22 ca                   and.s  cl,dl
>  [      ]*[a-f0-9]+:    66 21 d1                and    cx,dx
> -[      ]*[a-f0-9]+:    66 23 ca                and.s cx,dx
> +[      ]*[a-f0-9]+:    66 23 ca                and.s  cx,dx
>  [      ]*[a-f0-9]+:    21 d1                   and    ecx,edx
> -[      ]*[a-f0-9]+:    23 ca                   and.s ecx,edx
> +[      ]*[a-f0-9]+:    23 ca                   and.s  ecx,edx
>  [      ]*[a-f0-9]+:    38 d1                   cmp    cl,dl
> -[      ]*[a-f0-9]+:    3a ca                   cmp.s cl,dl
> +[      ]*[a-f0-9]+:    3a ca                   cmp.s  cl,dl
>  [      ]*[a-f0-9]+:    66 39 d1                cmp    cx,dx
> -[      ]*[a-f0-9]+:    66 3b ca                cmp.s cx,dx
> +[      ]*[a-f0-9]+:    66 3b ca                cmp.s  cx,dx
>  [      ]*[a-f0-9]+:    39 d1                   cmp    ecx,edx
> -[      ]*[a-f0-9]+:    3b ca                   cmp.s ecx,edx
> +[      ]*[a-f0-9]+:    3b ca                   cmp.s  ecx,edx
>  [      ]*[a-f0-9]+:    38 d1                   cmp    cl,dl
> -[      ]*[a-f0-9]+:    3a ca                   cmp.s cl,dl
> +[      ]*[a-f0-9]+:    3a ca                   cmp.s  cl,dl
>  [      ]*[a-f0-9]+:    66 39 d1                cmp    cx,dx
> -[      ]*[a-f0-9]+:    66 3b ca                cmp.s cx,dx
> +[      ]*[a-f0-9]+:    66 3b ca                cmp.s  cx,dx
>  [      ]*[a-f0-9]+:    39 d1                   cmp    ecx,edx
> -[      ]*[a-f0-9]+:    3b ca                   cmp.s ecx,edx
> +[      ]*[a-f0-9]+:    3b ca                   cmp.s  ecx,edx
>  [      ]*[a-f0-9]+:    88 d1                   mov    cl,dl
> -[      ]*[a-f0-9]+:    8a ca                   mov.s cl,dl
> +[      ]*[a-f0-9]+:    8a ca                   mov.s  cl,dl
>  [      ]*[a-f0-9]+:    66 89 d1                mov    cx,dx
> -[      ]*[a-f0-9]+:    66 8b ca                mov.s cx,dx
> +[      ]*[a-f0-9]+:    66 8b ca                mov.s  cx,dx
>  [      ]*[a-f0-9]+:    89 d1                   mov    ecx,edx
> -[      ]*[a-f0-9]+:    8b ca                   mov.s ecx,edx
> +[      ]*[a-f0-9]+:    8b ca                   mov.s  ecx,edx
>  [      ]*[a-f0-9]+:    88 d1                   mov    cl,dl
> -[      ]*[a-f0-9]+:    8a ca                   mov.s cl,dl
> +[      ]*[a-f0-9]+:    8a ca                   mov.s  cl,dl
>  [      ]*[a-f0-9]+:    66 89 d1                mov    cx,dx
> -[      ]*[a-f0-9]+:    66 8b ca                mov.s cx,dx
> +[      ]*[a-f0-9]+:    66 8b ca                mov.s  cx,dx
>  [      ]*[a-f0-9]+:    89 d1                   mov    ecx,edx
> -[      ]*[a-f0-9]+:    8b ca                   mov.s ecx,edx
> +[      ]*[a-f0-9]+:    8b ca                   mov.s  ecx,edx
>  [      ]*[a-f0-9]+:    08 d1                   or     cl,dl
> -[      ]*[a-f0-9]+:    0a ca                   or.s cl,dl
> +[      ]*[a-f0-9]+:    0a ca                   or.s   cl,dl
>  [      ]*[a-f0-9]+:    66 09 d1                or     cx,dx
> -[      ]*[a-f0-9]+:    66 0b ca                or.s cx,dx
> +[      ]*[a-f0-9]+:    66 0b ca                or.s   cx,dx
>  [      ]*[a-f0-9]+:    09 d1                   or     ecx,edx
> -[      ]*[a-f0-9]+:    0b ca                   or.s ecx,edx
> +[      ]*[a-f0-9]+:    0b ca                   or.s   ecx,edx
>  [      ]*[a-f0-9]+:    08 d1                   or     cl,dl
> -[      ]*[a-f0-9]+:    0a ca                   or.s cl,dl
> +[      ]*[a-f0-9]+:    0a ca                   or.s   cl,dl
>  [      ]*[a-f0-9]+:    66 09 d1                or     cx,dx
> -[      ]*[a-f0-9]+:    66 0b ca                or.s cx,dx
> +[      ]*[a-f0-9]+:    66 0b ca                or.s   cx,dx
>  [      ]*[a-f0-9]+:    09 d1                   or     ecx,edx
> -[      ]*[a-f0-9]+:    0b ca                   or.s ecx,edx
> +[      ]*[a-f0-9]+:    0b ca                   or.s   ecx,edx
>  [      ]*[a-f0-9]+:    18 d1                   sbb    cl,dl
> -[      ]*[a-f0-9]+:    1a ca                   sbb.s cl,dl
> +[      ]*[a-f0-9]+:    1a ca                   sbb.s  cl,dl
>  [      ]*[a-f0-9]+:    66 19 d1                sbb    cx,dx
> -[      ]*[a-f0-9]+:    66 1b ca                sbb.s cx,dx
> +[      ]*[a-f0-9]+:    66 1b ca                sbb.s  cx,dx
>  [      ]*[a-f0-9]+:    19 d1                   sbb    ecx,edx
> -[      ]*[a-f0-9]+:    1b ca                   sbb.s ecx,edx
> +[      ]*[a-f0-9]+:    1b ca                   sbb.s  ecx,edx
>  [      ]*[a-f0-9]+:    18 d1                   sbb    cl,dl
> -[      ]*[a-f0-9]+:    1a ca                   sbb.s cl,dl
> +[      ]*[a-f0-9]+:    1a ca                   sbb.s  cl,dl
>  [      ]*[a-f0-9]+:    66 19 d1                sbb    cx,dx
> -[      ]*[a-f0-9]+:    66 1b ca                sbb.s cx,dx
> +[      ]*[a-f0-9]+:    66 1b ca                sbb.s  cx,dx
>  [      ]*[a-f0-9]+:    19 d1                   sbb    ecx,edx
> -[      ]*[a-f0-9]+:    1b ca                   sbb.s ecx,edx
> +[      ]*[a-f0-9]+:    1b ca                   sbb.s  ecx,edx
>  [      ]*[a-f0-9]+:    28 d1                   sub    cl,dl
> -[      ]*[a-f0-9]+:    2a ca                   sub.s cl,dl
> +[      ]*[a-f0-9]+:    2a ca                   sub.s  cl,dl
>  [      ]*[a-f0-9]+:    66 29 d1                sub    cx,dx
> -[      ]*[a-f0-9]+:    66 2b ca                sub.s cx,dx
> +[      ]*[a-f0-9]+:    66 2b ca                sub.s  cx,dx
>  [      ]*[a-f0-9]+:    29 d1                   sub    ecx,edx
> -[      ]*[a-f0-9]+:    2b ca                   sub.s ecx,edx
> +[      ]*[a-f0-9]+:    2b ca                   sub.s  ecx,edx
>  [      ]*[a-f0-9]+:    28 d1                   sub    cl,dl
> -[      ]*[a-f0-9]+:    2a ca                   sub.s cl,dl
> +[      ]*[a-f0-9]+:    2a ca                   sub.s  cl,dl
>  [      ]*[a-f0-9]+:    66 29 d1                sub    cx,dx
> -[      ]*[a-f0-9]+:    66 2b ca                sub.s cx,dx
> +[      ]*[a-f0-9]+:    66 2b ca                sub.s  cx,dx
>  [      ]*[a-f0-9]+:    29 d1                   sub    ecx,edx
> -[      ]*[a-f0-9]+:    2b ca                   sub.s ecx,edx
> +[      ]*[a-f0-9]+:    2b ca                   sub.s  ecx,edx
>  [      ]*[a-f0-9]+:    30 d1                   xor    cl,dl
> -[      ]*[a-f0-9]+:    32 ca                   xor.s cl,dl
> +[      ]*[a-f0-9]+:    32 ca                   xor.s  cl,dl
>  [      ]*[a-f0-9]+:    66 31 d1                xor    cx,dx
> -[      ]*[a-f0-9]+:    66 33 ca                xor.s cx,dx
> +[      ]*[a-f0-9]+:    66 33 ca                xor.s  cx,dx
>  [      ]*[a-f0-9]+:    31 d1                   xor    ecx,edx
> -[      ]*[a-f0-9]+:    33 ca                   xor.s ecx,edx
> +[      ]*[a-f0-9]+:    33 ca                   xor.s  ecx,edx
>  [      ]*[a-f0-9]+:    30 d1                   xor    cl,dl
> -[      ]*[a-f0-9]+:    32 ca                   xor.s cl,dl
> +[      ]*[a-f0-9]+:    32 ca                   xor.s  cl,dl
>  [      ]*[a-f0-9]+:    66 31 d1                xor    cx,dx
> -[      ]*[a-f0-9]+:    66 33 ca                xor.s cx,dx
> +[      ]*[a-f0-9]+:    66 33 ca                xor.s  cx,dx
>  [      ]*[a-f0-9]+:    31 d1                   xor    ecx,edx
> -[      ]*[a-f0-9]+:    33 ca                   xor.s ecx,edx
> +[      ]*[a-f0-9]+:    33 ca                   xor.s  ecx,edx
>  [      ]*[a-f0-9]+:    c5 fd 28 f4             vmovapd ymm6,ymm4
>  [      ]*[a-f0-9]+:    c5 fd 29 e6             vmovapd.s ymm6,ymm4
>  [      ]*[a-f0-9]+:    c5 fc 28 f4             vmovaps ymm6,ymm4
> @@ -170,59 +170,59 @@ Disassembly of section .text:
>  [      ]*[a-f0-9]+:    66 0f 1a d1             bndmov bnd2,bnd1
>  [      ]*[a-f0-9]+:    66 0f 1b ca             bndmov.s bnd2,bnd1
>  [      ]*[a-f0-9]+:    00 d1                   add    cl,dl
> -[      ]*[a-f0-9]+:    02 ca                   add.s cl,dl
> +[      ]*[a-f0-9]+:    02 ca                   add.s  cl,dl
>  [      ]*[a-f0-9]+:    66 01 d1                add    cx,dx
> -[      ]*[a-f0-9]+:    66 03 ca                add.s cx,dx
> +[      ]*[a-f0-9]+:    66 03 ca                add.s  cx,dx
>  [      ]*[a-f0-9]+:    01 d1                   add    ecx,edx
> -[      ]*[a-f0-9]+:    03 ca                   add.s ecx,edx
> +[      ]*[a-f0-9]+:    03 ca                   add.s  ecx,edx
>  [      ]*[a-f0-9]+:    10 d1                   adc    cl,dl
> -[      ]*[a-f0-9]+:    12 ca                   adc.s cl,dl
> +[      ]*[a-f0-9]+:    12 ca                   adc.s  cl,dl
>  [      ]*[a-f0-9]+:    66 11 d1                adc    cx,dx
> -[      ]*[a-f0-9]+:    66 13 ca                adc.s cx,dx
> +[      ]*[a-f0-9]+:    66 13 ca                adc.s  cx,dx
>  [      ]*[a-f0-9]+:    11 d1                   adc    ecx,edx
> -[      ]*[a-f0-9]+:    13 ca                   adc.s ecx,edx
> +[      ]*[a-f0-9]+:    13 ca                   adc.s  ecx,edx
>  [      ]*[a-f0-9]+:    20 d1                   and    cl,dl
> -[      ]*[a-f0-9]+:    22 ca                   and.s cl,dl
> +[      ]*[a-f0-9]+:    22 ca                   and.s  cl,dl
>  [      ]*[a-f0-9]+:    66 21 d1                and    cx,dx
> -[      ]*[a-f0-9]+:    66 23 ca                and.s cx,dx
> +[      ]*[a-f0-9]+:    66 23 ca                and.s  cx,dx
>  [      ]*[a-f0-9]+:    21 d1                   and    ecx,edx
> -[      ]*[a-f0-9]+:    23 ca                   and.s ecx,edx
> +[      ]*[a-f0-9]+:    23 ca                   and.s  ecx,edx
>  [      ]*[a-f0-9]+:    38 d1                   cmp    cl,dl
> -[      ]*[a-f0-9]+:    3a ca                   cmp.s cl,dl
> +[      ]*[a-f0-9]+:    3a ca                   cmp.s  cl,dl
>  [      ]*[a-f0-9]+:    66 39 d1                cmp    cx,dx
> -[      ]*[a-f0-9]+:    66 3b ca                cmp.s cx,dx
> +[      ]*[a-f0-9]+:    66 3b ca                cmp.s  cx,dx
>  [      ]*[a-f0-9]+:    39 d1                   cmp    ecx,edx
> -[      ]*[a-f0-9]+:    3b ca                   cmp.s ecx,edx
> +[      ]*[a-f0-9]+:    3b ca                   cmp.s  ecx,edx
>  [      ]*[a-f0-9]+:    88 d1                   mov    cl,dl
> -[      ]*[a-f0-9]+:    8a ca                   mov.s cl,dl
> +[      ]*[a-f0-9]+:    8a ca                   mov.s  cl,dl
>  [      ]*[a-f0-9]+:    66 89 d1                mov    cx,dx
> -[      ]*[a-f0-9]+:    66 8b ca                mov.s cx,dx
> +[      ]*[a-f0-9]+:    66 8b ca                mov.s  cx,dx
>  [      ]*[a-f0-9]+:    89 d1                   mov    ecx,edx
> -[      ]*[a-f0-9]+:    8b ca                   mov.s ecx,edx
> +[      ]*[a-f0-9]+:    8b ca                   mov.s  ecx,edx
>  [      ]*[a-f0-9]+:    08 d1                   or     cl,dl
> -[      ]*[a-f0-9]+:    0a ca                   or.s cl,dl
> +[      ]*[a-f0-9]+:    0a ca                   or.s   cl,dl
>  [      ]*[a-f0-9]+:    66 09 d1                or     cx,dx
> -[      ]*[a-f0-9]+:    66 0b ca                or.s cx,dx
> +[      ]*[a-f0-9]+:    66 0b ca                or.s   cx,dx
>  [      ]*[a-f0-9]+:    09 d1                   or     ecx,edx
> -[      ]*[a-f0-9]+:    0b ca                   or.s ecx,edx
> +[      ]*[a-f0-9]+:    0b ca                   or.s   ecx,edx
>  [      ]*[a-f0-9]+:    18 d1                   sbb    cl,dl
> -[      ]*[a-f0-9]+:    1a ca                   sbb.s cl,dl
> +[      ]*[a-f0-9]+:    1a ca                   sbb.s  cl,dl
>  [      ]*[a-f0-9]+:    66 19 d1                sbb    cx,dx
> -[      ]*[a-f0-9]+:    66 1b ca                sbb.s cx,dx
> +[      ]*[a-f0-9]+:    66 1b ca                sbb.s  cx,dx
>  [      ]*[a-f0-9]+:    19 d1                   sbb    ecx,edx
> -[      ]*[a-f0-9]+:    1b ca                   sbb.s ecx,edx
> +[      ]*[a-f0-9]+:    1b ca                   sbb.s  ecx,edx
>  [      ]*[a-f0-9]+:    28 d1                   sub    cl,dl
> -[      ]*[a-f0-9]+:    2a ca                   sub.s cl,dl
> +[      ]*[a-f0-9]+:    2a ca                   sub.s  cl,dl
>  [      ]*[a-f0-9]+:    66 29 d1                sub    cx,dx
> -[      ]*[a-f0-9]+:    66 2b ca                sub.s cx,dx
> +[      ]*[a-f0-9]+:    66 2b ca                sub.s  cx,dx
>  [      ]*[a-f0-9]+:    29 d1                   sub    ecx,edx
> -[      ]*[a-f0-9]+:    2b ca                   sub.s ecx,edx
> +[      ]*[a-f0-9]+:    2b ca                   sub.s  ecx,edx
>  [      ]*[a-f0-9]+:    30 d1                   xor    cl,dl
> -[      ]*[a-f0-9]+:    32 ca                   xor.s cl,dl
> +[      ]*[a-f0-9]+:    32 ca                   xor.s  cl,dl
>  [      ]*[a-f0-9]+:    66 31 d1                xor    cx,dx
> -[      ]*[a-f0-9]+:    66 33 ca                xor.s cx,dx
> +[      ]*[a-f0-9]+:    66 33 ca                xor.s  cx,dx
>  [      ]*[a-f0-9]+:    31 d1                   xor    ecx,edx
> -[      ]*[a-f0-9]+:    33 ca                   xor.s ecx,edx
> +[      ]*[a-f0-9]+:    33 ca                   xor.s  ecx,edx
>  [      ]*[a-f0-9]+:    c5 fd 28 f4             vmovapd ymm6,ymm4
>  [      ]*[a-f0-9]+:    c5 fd 29 e6             vmovapd.s ymm6,ymm4
>  [      ]*[a-f0-9]+:    c5 fc 28 f4             vmovaps ymm6,ymm4
> diff --git a/gas/testsuite/gas/i386/sse2avx-opts.d b/gas/testsuite/gas/i386/sse2avx-opts.d
> index c0524b78aa..48e0933474 100644
> --- a/gas/testsuite/gas/i386/sse2avx-opts.d
> +++ b/gas/testsuite/gas/i386/sse2avx-opts.d
> @@ -70,17 +70,17 @@ Disassembly of section .text:
>  [      ]*[a-f0-9]+:    89 d1                   movl   %edx,%ecx
>  [      ]*[a-f0-9]+:    8b ca                   movl.s %edx,%ecx
>  [      ]*[a-f0-9]+:    08 d1                   orb    %dl,%cl
> -[      ]*[a-f0-9]+:    0a ca                   orb.s %dl,%cl
> +[      ]*[a-f0-9]+:    0a ca                   orb.s  %dl,%cl
>  [      ]*[a-f0-9]+:    66 09 d1                orw    %dx,%cx
> -[      ]*[a-f0-9]+:    66 0b ca                orw.s %dx,%cx
> +[      ]*[a-f0-9]+:    66 0b ca                orw.s  %dx,%cx
>  [      ]*[a-f0-9]+:    09 d1                   orl    %edx,%ecx
> -[      ]*[a-f0-9]+:    0b ca                   orl.s %edx,%ecx
> +[      ]*[a-f0-9]+:    0b ca                   orl.s  %edx,%ecx
>  [      ]*[a-f0-9]+:    08 d1                   orb    %dl,%cl
> -[      ]*[a-f0-9]+:    0a ca                   orb.s %dl,%cl
> +[      ]*[a-f0-9]+:    0a ca                   orb.s  %dl,%cl
>  [      ]*[a-f0-9]+:    66 09 d1                orw    %dx,%cx
> -[      ]*[a-f0-9]+:    66 0b ca                orw.s %dx,%cx
> +[      ]*[a-f0-9]+:    66 0b ca                orw.s  %dx,%cx
>  [      ]*[a-f0-9]+:    09 d1                   orl    %edx,%ecx
> -[      ]*[a-f0-9]+:    0b ca                   orl.s %edx,%ecx
> +[      ]*[a-f0-9]+:    0b ca                   orl.s  %edx,%ecx
>  [      ]*[a-f0-9]+:    18 d1                   sbbb   %dl,%cl
>  [      ]*[a-f0-9]+:    1a ca                   sbbb.s %dl,%cl
>  [      ]*[a-f0-9]+:    66 19 d1                sbbw   %dx,%cx
> @@ -200,11 +200,11 @@ Disassembly of section .text:
>  [      ]*[a-f0-9]+:    89 d1                   movl   %edx,%ecx
>  [      ]*[a-f0-9]+:    8b ca                   movl.s %edx,%ecx
>  [      ]*[a-f0-9]+:    08 d1                   orb    %dl,%cl
> -[      ]*[a-f0-9]+:    0a ca                   orb.s %dl,%cl
> +[      ]*[a-f0-9]+:    0a ca                   orb.s  %dl,%cl
>  [      ]*[a-f0-9]+:    66 09 d1                orw    %dx,%cx
> -[      ]*[a-f0-9]+:    66 0b ca                orw.s %dx,%cx
> +[      ]*[a-f0-9]+:    66 0b ca                orw.s  %dx,%cx
>  [      ]*[a-f0-9]+:    09 d1                   orl    %edx,%ecx
> -[      ]*[a-f0-9]+:    0b ca                   orl.s %edx,%ecx
> +[      ]*[a-f0-9]+:    0b ca                   orl.s  %edx,%ecx
>  [      ]*[a-f0-9]+:    18 d1                   sbbb   %dl,%cl
>  [      ]*[a-f0-9]+:    1a ca                   sbbb.s %dl,%cl
>  [      ]*[a-f0-9]+:    66 19 d1                sbbw   %dx,%cx
> diff --git a/gas/testsuite/gas/i386/x86-64-opts-intel.d b/gas/testsuite/gas/i386/x86-64-opts-intel.d
> index 5423b72d07..9769aec65f 100644
> --- a/gas/testsuite/gas/i386/x86-64-opts-intel.d
> +++ b/gas/testsuite/gas/i386/x86-64-opts-intel.d
> @@ -9,149 +9,149 @@ Disassembly of section .text:
>
>  0+ <_start>:
>  [      ]*[a-f0-9]+:    00 d1                   add    cl,dl
> -[      ]*[a-f0-9]+:    02 ca                   add.s cl,dl
> +[      ]*[a-f0-9]+:    02 ca                   add.s  cl,dl
>  [      ]*[a-f0-9]+:    66 01 d1                add    cx,dx
> -[      ]*[a-f0-9]+:    66 03 ca                add.s cx,dx
> +[      ]*[a-f0-9]+:    66 03 ca                add.s  cx,dx
>  [      ]*[a-f0-9]+:    01 d1                   add    ecx,edx
> -[      ]*[a-f0-9]+:    03 ca                   add.s ecx,edx
> +[      ]*[a-f0-9]+:    03 ca                   add.s  ecx,edx
>  [      ]*[a-f0-9]+:    00 d1                   add    cl,dl
> -[      ]*[a-f0-9]+:    02 ca                   add.s cl,dl
> +[      ]*[a-f0-9]+:    02 ca                   add.s  cl,dl
>  [      ]*[a-f0-9]+:    66 01 d1                add    cx,dx
> -[      ]*[a-f0-9]+:    66 03 ca                add.s cx,dx
> +[      ]*[a-f0-9]+:    66 03 ca                add.s  cx,dx
>  [      ]*[a-f0-9]+:    01 d1                   add    ecx,edx
> -[      ]*[a-f0-9]+:    03 ca                   add.s ecx,edx
> +[      ]*[a-f0-9]+:    03 ca                   add.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 01 d1                add    rcx,rdx
> -[      ]*[a-f0-9]+:    48 03 ca                add.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 03 ca                add.s  rcx,rdx
>  [      ]*[a-f0-9]+:    48 01 d1                add    rcx,rdx
> -[      ]*[a-f0-9]+:    48 03 ca                add.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 03 ca                add.s  rcx,rdx
>  [      ]*[a-f0-9]+:    10 d1                   adc    cl,dl
> -[      ]*[a-f0-9]+:    12 ca                   adc.s cl,dl
> +[      ]*[a-f0-9]+:    12 ca                   adc.s  cl,dl
>  [      ]*[a-f0-9]+:    66 11 d1                adc    cx,dx
> -[      ]*[a-f0-9]+:    66 13 ca                adc.s cx,dx
> +[      ]*[a-f0-9]+:    66 13 ca                adc.s  cx,dx
>  [      ]*[a-f0-9]+:    11 d1                   adc    ecx,edx
> -[      ]*[a-f0-9]+:    13 ca                   adc.s ecx,edx
> +[      ]*[a-f0-9]+:    13 ca                   adc.s  ecx,edx
>  [      ]*[a-f0-9]+:    10 d1                   adc    cl,dl
> -[      ]*[a-f0-9]+:    12 ca                   adc.s cl,dl
> +[      ]*[a-f0-9]+:    12 ca                   adc.s  cl,dl
>  [      ]*[a-f0-9]+:    66 11 d1                adc    cx,dx
> -[      ]*[a-f0-9]+:    66 13 ca                adc.s cx,dx
> +[      ]*[a-f0-9]+:    66 13 ca                adc.s  cx,dx
>  [      ]*[a-f0-9]+:    11 d1                   adc    ecx,edx
> -[      ]*[a-f0-9]+:    13 ca                   adc.s ecx,edx
> +[      ]*[a-f0-9]+:    13 ca                   adc.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 11 d1                adc    rcx,rdx
> -[      ]*[a-f0-9]+:    48 13 ca                adc.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 13 ca                adc.s  rcx,rdx
>  [      ]*[a-f0-9]+:    48 11 d1                adc    rcx,rdx
> -[      ]*[a-f0-9]+:    48 13 ca                adc.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 13 ca                adc.s  rcx,rdx
>  [      ]*[a-f0-9]+:    20 d1                   and    cl,dl
> -[      ]*[a-f0-9]+:    22 ca                   and.s cl,dl
> +[      ]*[a-f0-9]+:    22 ca                   and.s  cl,dl
>  [      ]*[a-f0-9]+:    66 21 d1                and    cx,dx
> -[      ]*[a-f0-9]+:    66 23 ca                and.s cx,dx
> +[      ]*[a-f0-9]+:    66 23 ca                and.s  cx,dx
>  [      ]*[a-f0-9]+:    21 d1                   and    ecx,edx
> -[      ]*[a-f0-9]+:    23 ca                   and.s ecx,edx
> +[      ]*[a-f0-9]+:    23 ca                   and.s  ecx,edx
>  [      ]*[a-f0-9]+:    20 d1                   and    cl,dl
> -[      ]*[a-f0-9]+:    22 ca                   and.s cl,dl
> +[      ]*[a-f0-9]+:    22 ca                   and.s  cl,dl
>  [      ]*[a-f0-9]+:    66 21 d1                and    cx,dx
> -[      ]*[a-f0-9]+:    66 23 ca                and.s cx,dx
> +[      ]*[a-f0-9]+:    66 23 ca                and.s  cx,dx
>  [      ]*[a-f0-9]+:    21 d1                   and    ecx,edx
> -[      ]*[a-f0-9]+:    23 ca                   and.s ecx,edx
> +[      ]*[a-f0-9]+:    23 ca                   and.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 21 d1                and    rcx,rdx
> -[      ]*[a-f0-9]+:    48 23 ca                and.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 23 ca                and.s  rcx,rdx
>  [      ]*[a-f0-9]+:    48 21 d1                and    rcx,rdx
> -[      ]*[a-f0-9]+:    48 23 ca                and.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 23 ca                and.s  rcx,rdx
>  [      ]*[a-f0-9]+:    38 d1                   cmp    cl,dl
> -[      ]*[a-f0-9]+:    3a ca                   cmp.s cl,dl
> +[      ]*[a-f0-9]+:    3a ca                   cmp.s  cl,dl
>  [      ]*[a-f0-9]+:    66 39 d1                cmp    cx,dx
> -[      ]*[a-f0-9]+:    66 3b ca                cmp.s cx,dx
> +[      ]*[a-f0-9]+:    66 3b ca                cmp.s  cx,dx
>  [      ]*[a-f0-9]+:    39 d1                   cmp    ecx,edx
> -[      ]*[a-f0-9]+:    3b ca                   cmp.s ecx,edx
> +[      ]*[a-f0-9]+:    3b ca                   cmp.s  ecx,edx
>  [      ]*[a-f0-9]+:    38 d1                   cmp    cl,dl
> -[      ]*[a-f0-9]+:    3a ca                   cmp.s cl,dl
> +[      ]*[a-f0-9]+:    3a ca                   cmp.s  cl,dl
>  [      ]*[a-f0-9]+:    66 39 d1                cmp    cx,dx
> -[      ]*[a-f0-9]+:    66 3b ca                cmp.s cx,dx
> +[      ]*[a-f0-9]+:    66 3b ca                cmp.s  cx,dx
>  [      ]*[a-f0-9]+:    39 d1                   cmp    ecx,edx
> -[      ]*[a-f0-9]+:    3b ca                   cmp.s ecx,edx
> +[      ]*[a-f0-9]+:    3b ca                   cmp.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 39 d1                cmp    rcx,rdx
> -[      ]*[a-f0-9]+:    48 3b ca                cmp.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 3b ca                cmp.s  rcx,rdx
>  [      ]*[a-f0-9]+:    48 39 d1                cmp    rcx,rdx
> -[      ]*[a-f0-9]+:    48 3b ca                cmp.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 3b ca                cmp.s  rcx,rdx
>  [      ]*[a-f0-9]+:    88 d1                   mov    cl,dl
> -[      ]*[a-f0-9]+:    8a ca                   mov.s cl,dl
> +[      ]*[a-f0-9]+:    8a ca                   mov.s  cl,dl
>  [      ]*[a-f0-9]+:    66 89 d1                mov    cx,dx
> -[      ]*[a-f0-9]+:    66 8b ca                mov.s cx,dx
> +[      ]*[a-f0-9]+:    66 8b ca                mov.s  cx,dx
>  [      ]*[a-f0-9]+:    89 d1                   mov    ecx,edx
> -[      ]*[a-f0-9]+:    8b ca                   mov.s ecx,edx
> +[      ]*[a-f0-9]+:    8b ca                   mov.s  ecx,edx
>  [      ]*[a-f0-9]+:    88 d1                   mov    cl,dl
> -[      ]*[a-f0-9]+:    8a ca                   mov.s cl,dl
> +[      ]*[a-f0-9]+:    8a ca                   mov.s  cl,dl
>  [      ]*[a-f0-9]+:    66 89 d1                mov    cx,dx
> -[      ]*[a-f0-9]+:    66 8b ca                mov.s cx,dx
> +[      ]*[a-f0-9]+:    66 8b ca                mov.s  cx,dx
>  [      ]*[a-f0-9]+:    89 d1                   mov    ecx,edx
> -[      ]*[a-f0-9]+:    8b ca                   mov.s ecx,edx
> +[      ]*[a-f0-9]+:    8b ca                   mov.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 89 d1                mov    rcx,rdx
> -[      ]*[a-f0-9]+:    48 8b ca                mov.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 8b ca                mov.s  rcx,rdx
>  [      ]*[a-f0-9]+:    48 89 d1                mov    rcx,rdx
> -[      ]*[a-f0-9]+:    48 8b ca                mov.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 8b ca                mov.s  rcx,rdx
>  [      ]*[a-f0-9]+:    08 d1                   or     cl,dl
> -[      ]*[a-f0-9]+:    0a ca                   or.s cl,dl
> +[      ]*[a-f0-9]+:    0a ca                   or.s   cl,dl
>  [      ]*[a-f0-9]+:    66 09 d1                or     cx,dx
> -[      ]*[a-f0-9]+:    66 0b ca                or.s cx,dx
> +[      ]*[a-f0-9]+:    66 0b ca                or.s   cx,dx
>  [      ]*[a-f0-9]+:    09 d1                   or     ecx,edx
> -[      ]*[a-f0-9]+:    0b ca                   or.s ecx,edx
> +[      ]*[a-f0-9]+:    0b ca                   or.s   ecx,edx
>  [      ]*[a-f0-9]+:    08 d1                   or     cl,dl
> -[      ]*[a-f0-9]+:    0a ca                   or.s cl,dl
> +[      ]*[a-f0-9]+:    0a ca                   or.s   cl,dl
>  [      ]*[a-f0-9]+:    66 09 d1                or     cx,dx
> -[      ]*[a-f0-9]+:    66 0b ca                or.s cx,dx
> +[      ]*[a-f0-9]+:    66 0b ca                or.s   cx,dx
>  [      ]*[a-f0-9]+:    09 d1                   or     ecx,edx
> -[      ]*[a-f0-9]+:    0b ca                   or.s ecx,edx
> +[      ]*[a-f0-9]+:    0b ca                   or.s   ecx,edx
>  [      ]*[a-f0-9]+:    48 09 d1                or     rcx,rdx
> -[      ]*[a-f0-9]+:    48 0b ca                or.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 0b ca                or.s   rcx,rdx
>  [      ]*[a-f0-9]+:    48 09 d1                or     rcx,rdx
> -[      ]*[a-f0-9]+:    48 0b ca                or.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 0b ca                or.s   rcx,rdx
>  [      ]*[a-f0-9]+:    18 d1                   sbb    cl,dl
> -[      ]*[a-f0-9]+:    1a ca                   sbb.s cl,dl
> +[      ]*[a-f0-9]+:    1a ca                   sbb.s  cl,dl
>  [      ]*[a-f0-9]+:    66 19 d1                sbb    cx,dx
> -[      ]*[a-f0-9]+:    66 1b ca                sbb.s cx,dx
> +[      ]*[a-f0-9]+:    66 1b ca                sbb.s  cx,dx
>  [      ]*[a-f0-9]+:    19 d1                   sbb    ecx,edx
> -[      ]*[a-f0-9]+:    1b ca                   sbb.s ecx,edx
> +[      ]*[a-f0-9]+:    1b ca                   sbb.s  ecx,edx
>  [      ]*[a-f0-9]+:    18 d1                   sbb    cl,dl
> -[      ]*[a-f0-9]+:    1a ca                   sbb.s cl,dl
> +[      ]*[a-f0-9]+:    1a ca                   sbb.s  cl,dl
>  [      ]*[a-f0-9]+:    66 19 d1                sbb    cx,dx
> -[      ]*[a-f0-9]+:    66 1b ca                sbb.s cx,dx
> +[      ]*[a-f0-9]+:    66 1b ca                sbb.s  cx,dx
>  [      ]*[a-f0-9]+:    19 d1                   sbb    ecx,edx
> -[      ]*[a-f0-9]+:    1b ca                   sbb.s ecx,edx
> +[      ]*[a-f0-9]+:    1b ca                   sbb.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 19 d1                sbb    rcx,rdx
> -[      ]*[a-f0-9]+:    48 1b ca                sbb.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 1b ca                sbb.s  rcx,rdx
>  [      ]*[a-f0-9]+:    48 19 d1                sbb    rcx,rdx
> -[      ]*[a-f0-9]+:    48 1b ca                sbb.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 1b ca                sbb.s  rcx,rdx
>  [      ]*[a-f0-9]+:    28 d1                   sub    cl,dl
> -[      ]*[a-f0-9]+:    2a ca                   sub.s cl,dl
> +[      ]*[a-f0-9]+:    2a ca                   sub.s  cl,dl
>  [      ]*[a-f0-9]+:    66 29 d1                sub    cx,dx
> -[      ]*[a-f0-9]+:    66 2b ca                sub.s cx,dx
> +[      ]*[a-f0-9]+:    66 2b ca                sub.s  cx,dx
>  [      ]*[a-f0-9]+:    29 d1                   sub    ecx,edx
> -[      ]*[a-f0-9]+:    2b ca                   sub.s ecx,edx
> +[      ]*[a-f0-9]+:    2b ca                   sub.s  ecx,edx
>  [      ]*[a-f0-9]+:    28 d1                   sub    cl,dl
> -[      ]*[a-f0-9]+:    2a ca                   sub.s cl,dl
> +[      ]*[a-f0-9]+:    2a ca                   sub.s  cl,dl
>  [      ]*[a-f0-9]+:    66 29 d1                sub    cx,dx
> -[      ]*[a-f0-9]+:    66 2b ca                sub.s cx,dx
> +[      ]*[a-f0-9]+:    66 2b ca                sub.s  cx,dx
>  [      ]*[a-f0-9]+:    29 d1                   sub    ecx,edx
> -[      ]*[a-f0-9]+:    2b ca                   sub.s ecx,edx
> +[      ]*[a-f0-9]+:    2b ca                   sub.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 29 d1                sub    rcx,rdx
> -[      ]*[a-f0-9]+:    48 2b ca                sub.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 2b ca                sub.s  rcx,rdx
>  [      ]*[a-f0-9]+:    48 29 d1                sub    rcx,rdx
> -[      ]*[a-f0-9]+:    48 2b ca                sub.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 2b ca                sub.s  rcx,rdx
>  [      ]*[a-f0-9]+:    30 d1                   xor    cl,dl
> -[      ]*[a-f0-9]+:    32 ca                   xor.s cl,dl
> +[      ]*[a-f0-9]+:    32 ca                   xor.s  cl,dl
>  [      ]*[a-f0-9]+:    66 31 d1                xor    cx,dx
> -[      ]*[a-f0-9]+:    66 33 ca                xor.s cx,dx
> +[      ]*[a-f0-9]+:    66 33 ca                xor.s  cx,dx
>  [      ]*[a-f0-9]+:    31 d1                   xor    ecx,edx
> -[      ]*[a-f0-9]+:    33 ca                   xor.s ecx,edx
> +[      ]*[a-f0-9]+:    33 ca                   xor.s  ecx,edx
>  [      ]*[a-f0-9]+:    30 d1                   xor    cl,dl
> -[      ]*[a-f0-9]+:    32 ca                   xor.s cl,dl
> +[      ]*[a-f0-9]+:    32 ca                   xor.s  cl,dl
>  [      ]*[a-f0-9]+:    66 31 d1                xor    cx,dx
> -[      ]*[a-f0-9]+:    66 33 ca                xor.s cx,dx
> +[      ]*[a-f0-9]+:    66 33 ca                xor.s  cx,dx
>  [      ]*[a-f0-9]+:    31 d1                   xor    ecx,edx
> -[      ]*[a-f0-9]+:    33 ca                   xor.s ecx,edx
> +[      ]*[a-f0-9]+:    33 ca                   xor.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 31 d1                xor    rcx,rdx
> -[      ]*[a-f0-9]+:    48 33 ca                xor.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 33 ca                xor.s  rcx,rdx
>  [      ]*[a-f0-9]+:    48 31 d1                xor    rcx,rdx
> -[      ]*[a-f0-9]+:    48 33 ca                xor.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 33 ca                xor.s  rcx,rdx
>  [      ]*[a-f0-9]+:    c5 fd 28 f4             vmovapd ymm6,ymm4
>  [      ]*[a-f0-9]+:    c5 fd 29 e6             vmovapd.s ymm6,ymm4
>  [      ]*[a-f0-9]+:    c5 fc 28 f4             vmovaps ymm6,ymm4
> @@ -203,77 +203,77 @@ Disassembly of section .text:
>  [      ]*[a-f0-9]+:    0f 6f e0                movq   mm4,mm0
>  [      ]*[a-f0-9]+:    0f 7f c4                movq.s mm4,mm0
>  [      ]*[a-f0-9]+:    00 d1                   add    cl,dl
> -[      ]*[a-f0-9]+:    02 ca                   add.s cl,dl
> +[      ]*[a-f0-9]+:    02 ca                   add.s  cl,dl
>  [      ]*[a-f0-9]+:    66 01 d1                add    cx,dx
> -[      ]*[a-f0-9]+:    66 03 ca                add.s cx,dx
> +[      ]*[a-f0-9]+:    66 03 ca                add.s  cx,dx
>  [      ]*[a-f0-9]+:    01 d1                   add    ecx,edx
> -[      ]*[a-f0-9]+:    03 ca                   add.s ecx,edx
> +[      ]*[a-f0-9]+:    03 ca                   add.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 01 d1                add    rcx,rdx
> -[      ]*[a-f0-9]+:    48 03 ca                add.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 03 ca                add.s  rcx,rdx
>  [      ]*[a-f0-9]+:    10 d1                   adc    cl,dl
> -[      ]*[a-f0-9]+:    12 ca                   adc.s cl,dl
> +[      ]*[a-f0-9]+:    12 ca                   adc.s  cl,dl
>  [      ]*[a-f0-9]+:    66 11 d1                adc    cx,dx
> -[      ]*[a-f0-9]+:    66 13 ca                adc.s cx,dx
> +[      ]*[a-f0-9]+:    66 13 ca                adc.s  cx,dx
>  [      ]*[a-f0-9]+:    11 d1                   adc    ecx,edx
> -[      ]*[a-f0-9]+:    13 ca                   adc.s ecx,edx
> +[      ]*[a-f0-9]+:    13 ca                   adc.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 11 d1                adc    rcx,rdx
> -[      ]*[a-f0-9]+:    48 13 ca                adc.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 13 ca                adc.s  rcx,rdx
>  [      ]*[a-f0-9]+:    20 d1                   and    cl,dl
> -[      ]*[a-f0-9]+:    22 ca                   and.s cl,dl
> +[      ]*[a-f0-9]+:    22 ca                   and.s  cl,dl
>  [      ]*[a-f0-9]+:    66 21 d1                and    cx,dx
> -[      ]*[a-f0-9]+:    66 23 ca                and.s cx,dx
> +[      ]*[a-f0-9]+:    66 23 ca                and.s  cx,dx
>  [      ]*[a-f0-9]+:    21 d1                   and    ecx,edx
> -[      ]*[a-f0-9]+:    23 ca                   and.s ecx,edx
> +[      ]*[a-f0-9]+:    23 ca                   and.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 21 d1                and    rcx,rdx
> -[      ]*[a-f0-9]+:    48 23 ca                and.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 23 ca                and.s  rcx,rdx
>  [      ]*[a-f0-9]+:    38 d1                   cmp    cl,dl
> -[      ]*[a-f0-9]+:    3a ca                   cmp.s cl,dl
> +[      ]*[a-f0-9]+:    3a ca                   cmp.s  cl,dl
>  [      ]*[a-f0-9]+:    66 39 d1                cmp    cx,dx
> -[      ]*[a-f0-9]+:    66 3b ca                cmp.s cx,dx
> +[      ]*[a-f0-9]+:    66 3b ca                cmp.s  cx,dx
>  [      ]*[a-f0-9]+:    39 d1                   cmp    ecx,edx
> -[      ]*[a-f0-9]+:    3b ca                   cmp.s ecx,edx
> +[      ]*[a-f0-9]+:    3b ca                   cmp.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 39 d1                cmp    rcx,rdx
> -[      ]*[a-f0-9]+:    48 3b ca                cmp.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 3b ca                cmp.s  rcx,rdx
>  [      ]*[a-f0-9]+:    88 d1                   mov    cl,dl
> -[      ]*[a-f0-9]+:    8a ca                   mov.s cl,dl
> +[      ]*[a-f0-9]+:    8a ca                   mov.s  cl,dl
>  [      ]*[a-f0-9]+:    66 89 d1                mov    cx,dx
> -[      ]*[a-f0-9]+:    66 8b ca                mov.s cx,dx
> +[      ]*[a-f0-9]+:    66 8b ca                mov.s  cx,dx
>  [      ]*[a-f0-9]+:    89 d1                   mov    ecx,edx
> -[      ]*[a-f0-9]+:    8b ca                   mov.s ecx,edx
> +[      ]*[a-f0-9]+:    8b ca                   mov.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 89 d1                mov    rcx,rdx
> -[      ]*[a-f0-9]+:    48 8b ca                mov.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 8b ca                mov.s  rcx,rdx
>  [      ]*[a-f0-9]+:    08 d1                   or     cl,dl
> -[      ]*[a-f0-9]+:    0a ca                   or.s cl,dl
> +[      ]*[a-f0-9]+:    0a ca                   or.s   cl,dl
>  [      ]*[a-f0-9]+:    66 09 d1                or     cx,dx
> -[      ]*[a-f0-9]+:    66 0b ca                or.s cx,dx
> +[      ]*[a-f0-9]+:    66 0b ca                or.s   cx,dx
>  [      ]*[a-f0-9]+:    09 d1                   or     ecx,edx
> -[      ]*[a-f0-9]+:    0b ca                   or.s ecx,edx
> +[      ]*[a-f0-9]+:    0b ca                   or.s   ecx,edx
>  [      ]*[a-f0-9]+:    48 09 d1                or     rcx,rdx
> -[      ]*[a-f0-9]+:    48 0b ca                or.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 0b ca                or.s   rcx,rdx
>  [      ]*[a-f0-9]+:    18 d1                   sbb    cl,dl
> -[      ]*[a-f0-9]+:    1a ca                   sbb.s cl,dl
> +[      ]*[a-f0-9]+:    1a ca                   sbb.s  cl,dl
>  [      ]*[a-f0-9]+:    66 19 d1                sbb    cx,dx
> -[      ]*[a-f0-9]+:    66 1b ca                sbb.s cx,dx
> +[      ]*[a-f0-9]+:    66 1b ca                sbb.s  cx,dx
>  [      ]*[a-f0-9]+:    19 d1                   sbb    ecx,edx
> -[      ]*[a-f0-9]+:    1b ca                   sbb.s ecx,edx
> +[      ]*[a-f0-9]+:    1b ca                   sbb.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 19 d1                sbb    rcx,rdx
> -[      ]*[a-f0-9]+:    48 1b ca                sbb.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 1b ca                sbb.s  rcx,rdx
>  [      ]*[a-f0-9]+:    28 d1                   sub    cl,dl
> -[      ]*[a-f0-9]+:    2a ca                   sub.s cl,dl
> +[      ]*[a-f0-9]+:    2a ca                   sub.s  cl,dl
>  [      ]*[a-f0-9]+:    66 29 d1                sub    cx,dx
> -[      ]*[a-f0-9]+:    66 2b ca                sub.s cx,dx
> +[      ]*[a-f0-9]+:    66 2b ca                sub.s  cx,dx
>  [      ]*[a-f0-9]+:    29 d1                   sub    ecx,edx
> -[      ]*[a-f0-9]+:    2b ca                   sub.s ecx,edx
> +[      ]*[a-f0-9]+:    2b ca                   sub.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 29 d1                sub    rcx,rdx
> -[      ]*[a-f0-9]+:    48 2b ca                sub.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 2b ca                sub.s  rcx,rdx
>  [      ]*[a-f0-9]+:    30 d1                   xor    cl,dl
> -[      ]*[a-f0-9]+:    32 ca                   xor.s cl,dl
> +[      ]*[a-f0-9]+:    32 ca                   xor.s  cl,dl
>  [      ]*[a-f0-9]+:    66 31 d1                xor    cx,dx
> -[      ]*[a-f0-9]+:    66 33 ca                xor.s cx,dx
> +[      ]*[a-f0-9]+:    66 33 ca                xor.s  cx,dx
>  [      ]*[a-f0-9]+:    31 d1                   xor    ecx,edx
> -[      ]*[a-f0-9]+:    33 ca                   xor.s ecx,edx
> +[      ]*[a-f0-9]+:    33 ca                   xor.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 31 d1                xor    rcx,rdx
> -[      ]*[a-f0-9]+:    48 33 ca                xor.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 33 ca                xor.s  rcx,rdx
>  [      ]*[a-f0-9]+:    c5 fd 28 f4             vmovapd ymm6,ymm4
>  [      ]*[a-f0-9]+:    c5 fd 29 e6             vmovapd.s ymm6,ymm4
>  [      ]*[a-f0-9]+:    c5 fc 28 f4             vmovaps ymm6,ymm4
> diff --git a/gas/testsuite/gas/i386/x86-64-opts.d b/gas/testsuite/gas/i386/x86-64-opts.d
> index 478f3fb3ef..daa9484ce5 100644
> --- a/gas/testsuite/gas/i386/x86-64-opts.d
> +++ b/gas/testsuite/gas/i386/x86-64-opts.d
> @@ -88,21 +88,21 @@ Disassembly of section .text:
>  [      ]*[a-f0-9]+:    48 89 d1                movq   %rdx,%rcx
>  [      ]*[a-f0-9]+:    48 8b ca                movq.s %rdx,%rcx
>  [      ]*[a-f0-9]+:    08 d1                   orb    %dl,%cl
> -[      ]*[a-f0-9]+:    0a ca                   orb.s %dl,%cl
> +[      ]*[a-f0-9]+:    0a ca                   orb.s  %dl,%cl
>  [      ]*[a-f0-9]+:    66 09 d1                orw    %dx,%cx
> -[      ]*[a-f0-9]+:    66 0b ca                orw.s %dx,%cx
> +[      ]*[a-f0-9]+:    66 0b ca                orw.s  %dx,%cx
>  [      ]*[a-f0-9]+:    09 d1                   orl    %edx,%ecx
> -[      ]*[a-f0-9]+:    0b ca                   orl.s %edx,%ecx
> +[      ]*[a-f0-9]+:    0b ca                   orl.s  %edx,%ecx
>  [      ]*[a-f0-9]+:    08 d1                   orb    %dl,%cl
> -[      ]*[a-f0-9]+:    0a ca                   orb.s %dl,%cl
> +[      ]*[a-f0-9]+:    0a ca                   orb.s  %dl,%cl
>  [      ]*[a-f0-9]+:    66 09 d1                orw    %dx,%cx
> -[      ]*[a-f0-9]+:    66 0b ca                orw.s %dx,%cx
> +[      ]*[a-f0-9]+:    66 0b ca                orw.s  %dx,%cx
>  [      ]*[a-f0-9]+:    09 d1                   orl    %edx,%ecx
> -[      ]*[a-f0-9]+:    0b ca                   orl.s %edx,%ecx
> +[      ]*[a-f0-9]+:    0b ca                   orl.s  %edx,%ecx
>  [      ]*[a-f0-9]+:    48 09 d1                orq    %rdx,%rcx
> -[      ]*[a-f0-9]+:    48 0b ca                orq.s %rdx,%rcx
> +[      ]*[a-f0-9]+:    48 0b ca                orq.s  %rdx,%rcx
>  [      ]*[a-f0-9]+:    48 09 d1                orq    %rdx,%rcx
> -[      ]*[a-f0-9]+:    48 0b ca                orq.s %rdx,%rcx
> +[      ]*[a-f0-9]+:    48 0b ca                orq.s  %rdx,%rcx
>  [      ]*[a-f0-9]+:    18 d1                   sbbb   %dl,%cl
>  [      ]*[a-f0-9]+:    1a ca                   sbbb.s %dl,%cl
>  [      ]*[a-f0-9]+:    66 19 d1                sbbw   %dx,%cx
> @@ -242,13 +242,13 @@ Disassembly of section .text:
>  [      ]*[a-f0-9]+:    48 89 d1                movq   %rdx,%rcx
>  [      ]*[a-f0-9]+:    48 8b ca                movq.s %rdx,%rcx
>  [      ]*[a-f0-9]+:    08 d1                   orb    %dl,%cl
> -[      ]*[a-f0-9]+:    0a ca                   orb.s %dl,%cl
> +[      ]*[a-f0-9]+:    0a ca                   orb.s  %dl,%cl
>  [      ]*[a-f0-9]+:    66 09 d1                orw    %dx,%cx
> -[      ]*[a-f0-9]+:    66 0b ca                orw.s %dx,%cx
> +[      ]*[a-f0-9]+:    66 0b ca                orw.s  %dx,%cx
>  [      ]*[a-f0-9]+:    09 d1                   orl    %edx,%ecx
> -[      ]*[a-f0-9]+:    0b ca                   orl.s %edx,%ecx
> +[      ]*[a-f0-9]+:    0b ca                   orl.s  %edx,%ecx
>  [      ]*[a-f0-9]+:    48 09 d1                orq    %rdx,%rcx
> -[      ]*[a-f0-9]+:    48 0b ca                orq.s %rdx,%rcx
> +[      ]*[a-f0-9]+:    48 0b ca                orq.s  %rdx,%rcx
>  [      ]*[a-f0-9]+:    18 d1                   sbbb   %dl,%cl
>  [      ]*[a-f0-9]+:    1a ca                   sbbb.s %dl,%cl
>  [      ]*[a-f0-9]+:    66 19 d1                sbbw   %dx,%cx
> diff --git a/gas/testsuite/gas/i386/x86-64-sse2avx-opts-intel.d b/gas/testsuite/gas/i386/x86-64-sse2avx-opts-intel.d
> index 1fe91f4780..6d9c81c922 100644
> --- a/gas/testsuite/gas/i386/x86-64-sse2avx-opts-intel.d
> +++ b/gas/testsuite/gas/i386/x86-64-sse2avx-opts-intel.d
> @@ -10,149 +10,149 @@ Disassembly of section .text:
>
>  0+ <_start>:
>  [      ]*[a-f0-9]+:    00 d1                   add    cl,dl
> -[      ]*[a-f0-9]+:    02 ca                   add.s cl,dl
> +[      ]*[a-f0-9]+:    02 ca                   add.s  cl,dl
>  [      ]*[a-f0-9]+:    66 01 d1                add    cx,dx
> -[      ]*[a-f0-9]+:    66 03 ca                add.s cx,dx
> +[      ]*[a-f0-9]+:    66 03 ca                add.s  cx,dx
>  [      ]*[a-f0-9]+:    01 d1                   add    ecx,edx
> -[      ]*[a-f0-9]+:    03 ca                   add.s ecx,edx
> +[      ]*[a-f0-9]+:    03 ca                   add.s  ecx,edx
>  [      ]*[a-f0-9]+:    00 d1                   add    cl,dl
> -[      ]*[a-f0-9]+:    02 ca                   add.s cl,dl
> +[      ]*[a-f0-9]+:    02 ca                   add.s  cl,dl
>  [      ]*[a-f0-9]+:    66 01 d1                add    cx,dx
> -[      ]*[a-f0-9]+:    66 03 ca                add.s cx,dx
> +[      ]*[a-f0-9]+:    66 03 ca                add.s  cx,dx
>  [      ]*[a-f0-9]+:    01 d1                   add    ecx,edx
> -[      ]*[a-f0-9]+:    03 ca                   add.s ecx,edx
> +[      ]*[a-f0-9]+:    03 ca                   add.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 01 d1                add    rcx,rdx
> -[      ]*[a-f0-9]+:    48 03 ca                add.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 03 ca                add.s  rcx,rdx
>  [      ]*[a-f0-9]+:    48 01 d1                add    rcx,rdx
> -[      ]*[a-f0-9]+:    48 03 ca                add.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 03 ca                add.s  rcx,rdx
>  [      ]*[a-f0-9]+:    10 d1                   adc    cl,dl
> -[      ]*[a-f0-9]+:    12 ca                   adc.s cl,dl
> +[      ]*[a-f0-9]+:    12 ca                   adc.s  cl,dl
>  [      ]*[a-f0-9]+:    66 11 d1                adc    cx,dx
> -[      ]*[a-f0-9]+:    66 13 ca                adc.s cx,dx
> +[      ]*[a-f0-9]+:    66 13 ca                adc.s  cx,dx
>  [      ]*[a-f0-9]+:    11 d1                   adc    ecx,edx
> -[      ]*[a-f0-9]+:    13 ca                   adc.s ecx,edx
> +[      ]*[a-f0-9]+:    13 ca                   adc.s  ecx,edx
>  [      ]*[a-f0-9]+:    10 d1                   adc    cl,dl
> -[      ]*[a-f0-9]+:    12 ca                   adc.s cl,dl
> +[      ]*[a-f0-9]+:    12 ca                   adc.s  cl,dl
>  [      ]*[a-f0-9]+:    66 11 d1                adc    cx,dx
> -[      ]*[a-f0-9]+:    66 13 ca                adc.s cx,dx
> +[      ]*[a-f0-9]+:    66 13 ca                adc.s  cx,dx
>  [      ]*[a-f0-9]+:    11 d1                   adc    ecx,edx
> -[      ]*[a-f0-9]+:    13 ca                   adc.s ecx,edx
> +[      ]*[a-f0-9]+:    13 ca                   adc.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 11 d1                adc    rcx,rdx
> -[      ]*[a-f0-9]+:    48 13 ca                adc.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 13 ca                adc.s  rcx,rdx
>  [      ]*[a-f0-9]+:    48 11 d1                adc    rcx,rdx
> -[      ]*[a-f0-9]+:    48 13 ca                adc.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 13 ca                adc.s  rcx,rdx
>  [      ]*[a-f0-9]+:    20 d1                   and    cl,dl
> -[      ]*[a-f0-9]+:    22 ca                   and.s cl,dl
> +[      ]*[a-f0-9]+:    22 ca                   and.s  cl,dl
>  [      ]*[a-f0-9]+:    66 21 d1                and    cx,dx
> -[      ]*[a-f0-9]+:    66 23 ca                and.s cx,dx
> +[      ]*[a-f0-9]+:    66 23 ca                and.s  cx,dx
>  [      ]*[a-f0-9]+:    21 d1                   and    ecx,edx
> -[      ]*[a-f0-9]+:    23 ca                   and.s ecx,edx
> +[      ]*[a-f0-9]+:    23 ca                   and.s  ecx,edx
>  [      ]*[a-f0-9]+:    20 d1                   and    cl,dl
> -[      ]*[a-f0-9]+:    22 ca                   and.s cl,dl
> +[      ]*[a-f0-9]+:    22 ca                   and.s  cl,dl
>  [      ]*[a-f0-9]+:    66 21 d1                and    cx,dx
> -[      ]*[a-f0-9]+:    66 23 ca                and.s cx,dx
> +[      ]*[a-f0-9]+:    66 23 ca                and.s  cx,dx
>  [      ]*[a-f0-9]+:    21 d1                   and    ecx,edx
> -[      ]*[a-f0-9]+:    23 ca                   and.s ecx,edx
> +[      ]*[a-f0-9]+:    23 ca                   and.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 21 d1                and    rcx,rdx
> -[      ]*[a-f0-9]+:    48 23 ca                and.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 23 ca                and.s  rcx,rdx
>  [      ]*[a-f0-9]+:    48 21 d1                and    rcx,rdx
> -[      ]*[a-f0-9]+:    48 23 ca                and.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 23 ca                and.s  rcx,rdx
>  [      ]*[a-f0-9]+:    38 d1                   cmp    cl,dl
> -[      ]*[a-f0-9]+:    3a ca                   cmp.s cl,dl
> +[      ]*[a-f0-9]+:    3a ca                   cmp.s  cl,dl
>  [      ]*[a-f0-9]+:    66 39 d1                cmp    cx,dx
> -[      ]*[a-f0-9]+:    66 3b ca                cmp.s cx,dx
> +[      ]*[a-f0-9]+:    66 3b ca                cmp.s  cx,dx
>  [      ]*[a-f0-9]+:    39 d1                   cmp    ecx,edx
> -[      ]*[a-f0-9]+:    3b ca                   cmp.s ecx,edx
> +[      ]*[a-f0-9]+:    3b ca                   cmp.s  ecx,edx
>  [      ]*[a-f0-9]+:    38 d1                   cmp    cl,dl
> -[      ]*[a-f0-9]+:    3a ca                   cmp.s cl,dl
> +[      ]*[a-f0-9]+:    3a ca                   cmp.s  cl,dl
>  [      ]*[a-f0-9]+:    66 39 d1                cmp    cx,dx
> -[      ]*[a-f0-9]+:    66 3b ca                cmp.s cx,dx
> +[      ]*[a-f0-9]+:    66 3b ca                cmp.s  cx,dx
>  [      ]*[a-f0-9]+:    39 d1                   cmp    ecx,edx
> -[      ]*[a-f0-9]+:    3b ca                   cmp.s ecx,edx
> +[      ]*[a-f0-9]+:    3b ca                   cmp.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 39 d1                cmp    rcx,rdx
> -[      ]*[a-f0-9]+:    48 3b ca                cmp.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 3b ca                cmp.s  rcx,rdx
>  [      ]*[a-f0-9]+:    48 39 d1                cmp    rcx,rdx
> -[      ]*[a-f0-9]+:    48 3b ca                cmp.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 3b ca                cmp.s  rcx,rdx
>  [      ]*[a-f0-9]+:    88 d1                   mov    cl,dl
> -[      ]*[a-f0-9]+:    8a ca                   mov.s cl,dl
> +[      ]*[a-f0-9]+:    8a ca                   mov.s  cl,dl
>  [      ]*[a-f0-9]+:    66 89 d1                mov    cx,dx
> -[      ]*[a-f0-9]+:    66 8b ca                mov.s cx,dx
> +[      ]*[a-f0-9]+:    66 8b ca                mov.s  cx,dx
>  [      ]*[a-f0-9]+:    89 d1                   mov    ecx,edx
> -[      ]*[a-f0-9]+:    8b ca                   mov.s ecx,edx
> +[      ]*[a-f0-9]+:    8b ca                   mov.s  ecx,edx
>  [      ]*[a-f0-9]+:    88 d1                   mov    cl,dl
> -[      ]*[a-f0-9]+:    8a ca                   mov.s cl,dl
> +[      ]*[a-f0-9]+:    8a ca                   mov.s  cl,dl
>  [      ]*[a-f0-9]+:    66 89 d1                mov    cx,dx
> -[      ]*[a-f0-9]+:    66 8b ca                mov.s cx,dx
> +[      ]*[a-f0-9]+:    66 8b ca                mov.s  cx,dx
>  [      ]*[a-f0-9]+:    89 d1                   mov    ecx,edx
> -[      ]*[a-f0-9]+:    8b ca                   mov.s ecx,edx
> +[      ]*[a-f0-9]+:    8b ca                   mov.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 89 d1                mov    rcx,rdx
> -[      ]*[a-f0-9]+:    48 8b ca                mov.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 8b ca                mov.s  rcx,rdx
>  [      ]*[a-f0-9]+:    48 89 d1                mov    rcx,rdx
> -[      ]*[a-f0-9]+:    48 8b ca                mov.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 8b ca                mov.s  rcx,rdx
>  [      ]*[a-f0-9]+:    08 d1                   or     cl,dl
> -[      ]*[a-f0-9]+:    0a ca                   or.s cl,dl
> +[      ]*[a-f0-9]+:    0a ca                   or.s   cl,dl
>  [      ]*[a-f0-9]+:    66 09 d1                or     cx,dx
> -[      ]*[a-f0-9]+:    66 0b ca                or.s cx,dx
> +[      ]*[a-f0-9]+:    66 0b ca                or.s   cx,dx
>  [      ]*[a-f0-9]+:    09 d1                   or     ecx,edx
> -[      ]*[a-f0-9]+:    0b ca                   or.s ecx,edx
> +[      ]*[a-f0-9]+:    0b ca                   or.s   ecx,edx
>  [      ]*[a-f0-9]+:    08 d1                   or     cl,dl
> -[      ]*[a-f0-9]+:    0a ca                   or.s cl,dl
> +[      ]*[a-f0-9]+:    0a ca                   or.s   cl,dl
>  [      ]*[a-f0-9]+:    66 09 d1                or     cx,dx
> -[      ]*[a-f0-9]+:    66 0b ca                or.s cx,dx
> +[      ]*[a-f0-9]+:    66 0b ca                or.s   cx,dx
>  [      ]*[a-f0-9]+:    09 d1                   or     ecx,edx
> -[      ]*[a-f0-9]+:    0b ca                   or.s ecx,edx
> +[      ]*[a-f0-9]+:    0b ca                   or.s   ecx,edx
>  [      ]*[a-f0-9]+:    48 09 d1                or     rcx,rdx
> -[      ]*[a-f0-9]+:    48 0b ca                or.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 0b ca                or.s   rcx,rdx
>  [      ]*[a-f0-9]+:    48 09 d1                or     rcx,rdx
> -[      ]*[a-f0-9]+:    48 0b ca                or.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 0b ca                or.s   rcx,rdx
>  [      ]*[a-f0-9]+:    18 d1                   sbb    cl,dl
> -[      ]*[a-f0-9]+:    1a ca                   sbb.s cl,dl
> +[      ]*[a-f0-9]+:    1a ca                   sbb.s  cl,dl
>  [      ]*[a-f0-9]+:    66 19 d1                sbb    cx,dx
> -[      ]*[a-f0-9]+:    66 1b ca                sbb.s cx,dx
> +[      ]*[a-f0-9]+:    66 1b ca                sbb.s  cx,dx
>  [      ]*[a-f0-9]+:    19 d1                   sbb    ecx,edx
> -[      ]*[a-f0-9]+:    1b ca                   sbb.s ecx,edx
> +[      ]*[a-f0-9]+:    1b ca                   sbb.s  ecx,edx
>  [      ]*[a-f0-9]+:    18 d1                   sbb    cl,dl
> -[      ]*[a-f0-9]+:    1a ca                   sbb.s cl,dl
> +[      ]*[a-f0-9]+:    1a ca                   sbb.s  cl,dl
>  [      ]*[a-f0-9]+:    66 19 d1                sbb    cx,dx
> -[      ]*[a-f0-9]+:    66 1b ca                sbb.s cx,dx
> +[      ]*[a-f0-9]+:    66 1b ca                sbb.s  cx,dx
>  [      ]*[a-f0-9]+:    19 d1                   sbb    ecx,edx
> -[      ]*[a-f0-9]+:    1b ca                   sbb.s ecx,edx
> +[      ]*[a-f0-9]+:    1b ca                   sbb.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 19 d1                sbb    rcx,rdx
> -[      ]*[a-f0-9]+:    48 1b ca                sbb.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 1b ca                sbb.s  rcx,rdx
>  [      ]*[a-f0-9]+:    48 19 d1                sbb    rcx,rdx
> -[      ]*[a-f0-9]+:    48 1b ca                sbb.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 1b ca                sbb.s  rcx,rdx
>  [      ]*[a-f0-9]+:    28 d1                   sub    cl,dl
> -[      ]*[a-f0-9]+:    2a ca                   sub.s cl,dl
> +[      ]*[a-f0-9]+:    2a ca                   sub.s  cl,dl
>  [      ]*[a-f0-9]+:    66 29 d1                sub    cx,dx
> -[      ]*[a-f0-9]+:    66 2b ca                sub.s cx,dx
> +[      ]*[a-f0-9]+:    66 2b ca                sub.s  cx,dx
>  [      ]*[a-f0-9]+:    29 d1                   sub    ecx,edx
> -[      ]*[a-f0-9]+:    2b ca                   sub.s ecx,edx
> +[      ]*[a-f0-9]+:    2b ca                   sub.s  ecx,edx
>  [      ]*[a-f0-9]+:    28 d1                   sub    cl,dl
> -[      ]*[a-f0-9]+:    2a ca                   sub.s cl,dl
> +[      ]*[a-f0-9]+:    2a ca                   sub.s  cl,dl
>  [      ]*[a-f0-9]+:    66 29 d1                sub    cx,dx
> -[      ]*[a-f0-9]+:    66 2b ca                sub.s cx,dx
> +[      ]*[a-f0-9]+:    66 2b ca                sub.s  cx,dx
>  [      ]*[a-f0-9]+:    29 d1                   sub    ecx,edx
> -[      ]*[a-f0-9]+:    2b ca                   sub.s ecx,edx
> +[      ]*[a-f0-9]+:    2b ca                   sub.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 29 d1                sub    rcx,rdx
> -[      ]*[a-f0-9]+:    48 2b ca                sub.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 2b ca                sub.s  rcx,rdx
>  [      ]*[a-f0-9]+:    48 29 d1                sub    rcx,rdx
> -[      ]*[a-f0-9]+:    48 2b ca                sub.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 2b ca                sub.s  rcx,rdx
>  [      ]*[a-f0-9]+:    30 d1                   xor    cl,dl
> -[      ]*[a-f0-9]+:    32 ca                   xor.s cl,dl
> +[      ]*[a-f0-9]+:    32 ca                   xor.s  cl,dl
>  [      ]*[a-f0-9]+:    66 31 d1                xor    cx,dx
> -[      ]*[a-f0-9]+:    66 33 ca                xor.s cx,dx
> +[      ]*[a-f0-9]+:    66 33 ca                xor.s  cx,dx
>  [      ]*[a-f0-9]+:    31 d1                   xor    ecx,edx
> -[      ]*[a-f0-9]+:    33 ca                   xor.s ecx,edx
> +[      ]*[a-f0-9]+:    33 ca                   xor.s  ecx,edx
>  [      ]*[a-f0-9]+:    30 d1                   xor    cl,dl
> -[      ]*[a-f0-9]+:    32 ca                   xor.s cl,dl
> +[      ]*[a-f0-9]+:    32 ca                   xor.s  cl,dl
>  [      ]*[a-f0-9]+:    66 31 d1                xor    cx,dx
> -[      ]*[a-f0-9]+:    66 33 ca                xor.s cx,dx
> +[      ]*[a-f0-9]+:    66 33 ca                xor.s  cx,dx
>  [      ]*[a-f0-9]+:    31 d1                   xor    ecx,edx
> -[      ]*[a-f0-9]+:    33 ca                   xor.s ecx,edx
> +[      ]*[a-f0-9]+:    33 ca                   xor.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 31 d1                xor    rcx,rdx
> -[      ]*[a-f0-9]+:    48 33 ca                xor.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 33 ca                xor.s  rcx,rdx
>  [      ]*[a-f0-9]+:    48 31 d1                xor    rcx,rdx
> -[      ]*[a-f0-9]+:    48 33 ca                xor.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 33 ca                xor.s  rcx,rdx
>  [      ]*[a-f0-9]+:    c5 fd 28 f4             vmovapd ymm6,ymm4
>  [      ]*[a-f0-9]+:    c5 fd 29 e6             vmovapd.s ymm6,ymm4
>  [      ]*[a-f0-9]+:    c5 fc 28 f4             vmovaps ymm6,ymm4
> @@ -204,77 +204,77 @@ Disassembly of section .text:
>  [      ]*[a-f0-9]+:    0f 6f e0                movq   mm4,mm0
>  [      ]*[a-f0-9]+:    0f 7f c4                movq.s mm4,mm0
>  [      ]*[a-f0-9]+:    00 d1                   add    cl,dl
> -[      ]*[a-f0-9]+:    02 ca                   add.s cl,dl
> +[      ]*[a-f0-9]+:    02 ca                   add.s  cl,dl
>  [      ]*[a-f0-9]+:    66 01 d1                add    cx,dx
> -[      ]*[a-f0-9]+:    66 03 ca                add.s cx,dx
> +[      ]*[a-f0-9]+:    66 03 ca                add.s  cx,dx
>  [      ]*[a-f0-9]+:    01 d1                   add    ecx,edx
> -[      ]*[a-f0-9]+:    03 ca                   add.s ecx,edx
> +[      ]*[a-f0-9]+:    03 ca                   add.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 01 d1                add    rcx,rdx
> -[      ]*[a-f0-9]+:    48 03 ca                add.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 03 ca                add.s  rcx,rdx
>  [      ]*[a-f0-9]+:    10 d1                   adc    cl,dl
> -[      ]*[a-f0-9]+:    12 ca                   adc.s cl,dl
> +[      ]*[a-f0-9]+:    12 ca                   adc.s  cl,dl
>  [      ]*[a-f0-9]+:    66 11 d1                adc    cx,dx
> -[      ]*[a-f0-9]+:    66 13 ca                adc.s cx,dx
> +[      ]*[a-f0-9]+:    66 13 ca                adc.s  cx,dx
>  [      ]*[a-f0-9]+:    11 d1                   adc    ecx,edx
> -[      ]*[a-f0-9]+:    13 ca                   adc.s ecx,edx
> +[      ]*[a-f0-9]+:    13 ca                   adc.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 11 d1                adc    rcx,rdx
> -[      ]*[a-f0-9]+:    48 13 ca                adc.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 13 ca                adc.s  rcx,rdx
>  [      ]*[a-f0-9]+:    20 d1                   and    cl,dl
> -[      ]*[a-f0-9]+:    22 ca                   and.s cl,dl
> +[      ]*[a-f0-9]+:    22 ca                   and.s  cl,dl
>  [      ]*[a-f0-9]+:    66 21 d1                and    cx,dx
> -[      ]*[a-f0-9]+:    66 23 ca                and.s cx,dx
> +[      ]*[a-f0-9]+:    66 23 ca                and.s  cx,dx
>  [      ]*[a-f0-9]+:    21 d1                   and    ecx,edx
> -[      ]*[a-f0-9]+:    23 ca                   and.s ecx,edx
> +[      ]*[a-f0-9]+:    23 ca                   and.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 21 d1                and    rcx,rdx
> -[      ]*[a-f0-9]+:    48 23 ca                and.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 23 ca                and.s  rcx,rdx
>  [      ]*[a-f0-9]+:    38 d1                   cmp    cl,dl
> -[      ]*[a-f0-9]+:    3a ca                   cmp.s cl,dl
> +[      ]*[a-f0-9]+:    3a ca                   cmp.s  cl,dl
>  [      ]*[a-f0-9]+:    66 39 d1                cmp    cx,dx
> -[      ]*[a-f0-9]+:    66 3b ca                cmp.s cx,dx
> +[      ]*[a-f0-9]+:    66 3b ca                cmp.s  cx,dx
>  [      ]*[a-f0-9]+:    39 d1                   cmp    ecx,edx
> -[      ]*[a-f0-9]+:    3b ca                   cmp.s ecx,edx
> +[      ]*[a-f0-9]+:    3b ca                   cmp.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 39 d1                cmp    rcx,rdx
> -[      ]*[a-f0-9]+:    48 3b ca                cmp.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 3b ca                cmp.s  rcx,rdx
>  [      ]*[a-f0-9]+:    88 d1                   mov    cl,dl
> -[      ]*[a-f0-9]+:    8a ca                   mov.s cl,dl
> +[      ]*[a-f0-9]+:    8a ca                   mov.s  cl,dl
>  [      ]*[a-f0-9]+:    66 89 d1                mov    cx,dx
> -[      ]*[a-f0-9]+:    66 8b ca                mov.s cx,dx
> +[      ]*[a-f0-9]+:    66 8b ca                mov.s  cx,dx
>  [      ]*[a-f0-9]+:    89 d1                   mov    ecx,edx
> -[      ]*[a-f0-9]+:    8b ca                   mov.s ecx,edx
> +[      ]*[a-f0-9]+:    8b ca                   mov.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 89 d1                mov    rcx,rdx
> -[      ]*[a-f0-9]+:    48 8b ca                mov.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 8b ca                mov.s  rcx,rdx
>  [      ]*[a-f0-9]+:    08 d1                   or     cl,dl
> -[      ]*[a-f0-9]+:    0a ca                   or.s cl,dl
> +[      ]*[a-f0-9]+:    0a ca                   or.s   cl,dl
>  [      ]*[a-f0-9]+:    66 09 d1                or     cx,dx
> -[      ]*[a-f0-9]+:    66 0b ca                or.s cx,dx
> +[      ]*[a-f0-9]+:    66 0b ca                or.s   cx,dx
>  [      ]*[a-f0-9]+:    09 d1                   or     ecx,edx
> -[      ]*[a-f0-9]+:    0b ca                   or.s ecx,edx
> +[      ]*[a-f0-9]+:    0b ca                   or.s   ecx,edx
>  [      ]*[a-f0-9]+:    48 09 d1                or     rcx,rdx
> -[      ]*[a-f0-9]+:    48 0b ca                or.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 0b ca                or.s   rcx,rdx
>  [      ]*[a-f0-9]+:    18 d1                   sbb    cl,dl
> -[      ]*[a-f0-9]+:    1a ca                   sbb.s cl,dl
> +[      ]*[a-f0-9]+:    1a ca                   sbb.s  cl,dl
>  [      ]*[a-f0-9]+:    66 19 d1                sbb    cx,dx
> -[      ]*[a-f0-9]+:    66 1b ca                sbb.s cx,dx
> +[      ]*[a-f0-9]+:    66 1b ca                sbb.s  cx,dx
>  [      ]*[a-f0-9]+:    19 d1                   sbb    ecx,edx
> -[      ]*[a-f0-9]+:    1b ca                   sbb.s ecx,edx
> +[      ]*[a-f0-9]+:    1b ca                   sbb.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 19 d1                sbb    rcx,rdx
> -[      ]*[a-f0-9]+:    48 1b ca                sbb.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 1b ca                sbb.s  rcx,rdx
>  [      ]*[a-f0-9]+:    28 d1                   sub    cl,dl
> -[      ]*[a-f0-9]+:    2a ca                   sub.s cl,dl
> +[      ]*[a-f0-9]+:    2a ca                   sub.s  cl,dl
>  [      ]*[a-f0-9]+:    66 29 d1                sub    cx,dx
> -[      ]*[a-f0-9]+:    66 2b ca                sub.s cx,dx
> +[      ]*[a-f0-9]+:    66 2b ca                sub.s  cx,dx
>  [      ]*[a-f0-9]+:    29 d1                   sub    ecx,edx
> -[      ]*[a-f0-9]+:    2b ca                   sub.s ecx,edx
> +[      ]*[a-f0-9]+:    2b ca                   sub.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 29 d1                sub    rcx,rdx
> -[      ]*[a-f0-9]+:    48 2b ca                sub.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 2b ca                sub.s  rcx,rdx
>  [      ]*[a-f0-9]+:    30 d1                   xor    cl,dl
> -[      ]*[a-f0-9]+:    32 ca                   xor.s cl,dl
> +[      ]*[a-f0-9]+:    32 ca                   xor.s  cl,dl
>  [      ]*[a-f0-9]+:    66 31 d1                xor    cx,dx
> -[      ]*[a-f0-9]+:    66 33 ca                xor.s cx,dx
> +[      ]*[a-f0-9]+:    66 33 ca                xor.s  cx,dx
>  [      ]*[a-f0-9]+:    31 d1                   xor    ecx,edx
> -[      ]*[a-f0-9]+:    33 ca                   xor.s ecx,edx
> +[      ]*[a-f0-9]+:    33 ca                   xor.s  ecx,edx
>  [      ]*[a-f0-9]+:    48 31 d1                xor    rcx,rdx
> -[      ]*[a-f0-9]+:    48 33 ca                xor.s rcx,rdx
> +[      ]*[a-f0-9]+:    48 33 ca                xor.s  rcx,rdx
>  [      ]*[a-f0-9]+:    c5 fd 28 f4             vmovapd ymm6,ymm4
>  [      ]*[a-f0-9]+:    c5 fd 29 e6             vmovapd.s ymm6,ymm4
>  [      ]*[a-f0-9]+:    c5 fc 28 f4             vmovaps ymm6,ymm4
> diff --git a/gas/testsuite/gas/i386/x86-64-sse2avx-opts.d b/gas/testsuite/gas/i386/x86-64-sse2avx-opts.d
> index 7fe4b8ecaa..3a2362d0e5 100644
> --- a/gas/testsuite/gas/i386/x86-64-sse2avx-opts.d
> +++ b/gas/testsuite/gas/i386/x86-64-sse2avx-opts.d
> @@ -90,21 +90,21 @@ Disassembly of section .text:
>  [      ]*[a-f0-9]+:    48 89 d1                movq   %rdx,%rcx
>  [      ]*[a-f0-9]+:    48 8b ca                movq.s %rdx,%rcx
>  [      ]*[a-f0-9]+:    08 d1                   orb    %dl,%cl
> -[      ]*[a-f0-9]+:    0a ca                   orb.s %dl,%cl
> +[      ]*[a-f0-9]+:    0a ca                   orb.s  %dl,%cl
>  [      ]*[a-f0-9]+:    66 09 d1                orw    %dx,%cx
> -[      ]*[a-f0-9]+:    66 0b ca                orw.s %dx,%cx
> +[      ]*[a-f0-9]+:    66 0b ca                orw.s  %dx,%cx
>  [      ]*[a-f0-9]+:    09 d1                   orl    %edx,%ecx
> -[      ]*[a-f0-9]+:    0b ca                   orl.s %edx,%ecx
> +[      ]*[a-f0-9]+:    0b ca                   orl.s  %edx,%ecx
>  [      ]*[a-f0-9]+:    08 d1                   orb    %dl,%cl
> -[      ]*[a-f0-9]+:    0a ca                   orb.s %dl,%cl
> +[      ]*[a-f0-9]+:    0a ca                   orb.s  %dl,%cl
>  [      ]*[a-f0-9]+:    66 09 d1                orw    %dx,%cx
> -[      ]*[a-f0-9]+:    66 0b ca                orw.s %dx,%cx
> +[      ]*[a-f0-9]+:    66 0b ca                orw.s  %dx,%cx
>  [      ]*[a-f0-9]+:    09 d1                   orl    %edx,%ecx
> -[      ]*[a-f0-9]+:    0b ca                   orl.s %edx,%ecx
> +[      ]*[a-f0-9]+:    0b ca                   orl.s  %edx,%ecx
>  [      ]*[a-f0-9]+:    48 09 d1                orq    %rdx,%rcx
> -[      ]*[a-f0-9]+:    48 0b ca                orq.s %rdx,%rcx
> +[      ]*[a-f0-9]+:    48 0b ca                orq.s  %rdx,%rcx
>  [      ]*[a-f0-9]+:    48 09 d1                orq    %rdx,%rcx
> -[      ]*[a-f0-9]+:    48 0b ca                orq.s %rdx,%rcx
> +[      ]*[a-f0-9]+:    48 0b ca                orq.s  %rdx,%rcx
>  [      ]*[a-f0-9]+:    18 d1                   sbbb   %dl,%cl
>  [      ]*[a-f0-9]+:    1a ca                   sbbb.s %dl,%cl
>  [      ]*[a-f0-9]+:    66 19 d1                sbbw   %dx,%cx
> @@ -244,13 +244,13 @@ Disassembly of section .text:
>  [      ]*[a-f0-9]+:    48 89 d1                movq   %rdx,%rcx
>  [      ]*[a-f0-9]+:    48 8b ca                movq.s %rdx,%rcx
>  [      ]*[a-f0-9]+:    08 d1                   orb    %dl,%cl
> -[      ]*[a-f0-9]+:    0a ca                   orb.s %dl,%cl
> +[      ]*[a-f0-9]+:    0a ca                   orb.s  %dl,%cl
>  [      ]*[a-f0-9]+:    66 09 d1                orw    %dx,%cx
> -[      ]*[a-f0-9]+:    66 0b ca                orw.s %dx,%cx
> +[      ]*[a-f0-9]+:    66 0b ca                orw.s  %dx,%cx
>  [      ]*[a-f0-9]+:    09 d1                   orl    %edx,%ecx
> -[      ]*[a-f0-9]+:    0b ca                   orl.s %edx,%ecx
> +[      ]*[a-f0-9]+:    0b ca                   orl.s  %edx,%ecx
>  [      ]*[a-f0-9]+:    48 09 d1                orq    %rdx,%rcx
> -[      ]*[a-f0-9]+:    48 0b ca                orq.s %rdx,%rcx
> +[      ]*[a-f0-9]+:    48 0b ca                orq.s  %rdx,%rcx
>  [      ]*[a-f0-9]+:    18 d1                   sbbb   %dl,%cl
>  [      ]*[a-f0-9]+:    1a ca                   sbbb.s %dl,%cl
>  [      ]*[a-f0-9]+:    66 19 d1                sbbw   %dx,%cx
> diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
> index 926f776de8..de3f245cb5 100644
> --- a/opcodes/i386-dis.c
> +++ b/opcodes/i386-dis.c
> @@ -10307,6 +10307,7 @@ swap_operand (void)
>  {
>    mnemonicendp[0] = '.';
>    mnemonicendp[1] = 's';
> +  mnemonicendp[2] = '\0';
>    mnemonicendp += 2;
>  }
>
> --
> 2.27.0
>

Thanks.

--
H.J.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Cleanup mnemonicendp in swap_operand()
       [not found]   ` <2e2351bf-3737-7520-ed87-3ffacc0eb8f7@oracle.com>
@ 2021-12-18  1:56     ` H.J. Lu
  0 siblings, 0 replies; 3+ messages in thread
From: H.J. Lu @ 2021-12-18  1:56 UTC (permalink / raw)
  To: Vladimir Mezentsev, Binutils

On Fri, Dec 17, 2021 at 4:42 PM Vladimir Mezentsev
<vladimir.mezentsev@oracle.com> wrote:
>
>
>
> On 12/17/21 15:37, H.J. Lu wrote:
>
> On Fri, Dec 17, 2021 at 3:27 PM Vladimir Mezentsev via Binutils
> <binutils@sourceware.org> wrote:
>
> From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
>
> Tested on x86_64-pc-linux-gnu.
>
> opcodes/ChangeLog:
> 2021-12-17 Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
>
>         * opcodes/i386-dis.c (swap_operand): Cleanup mnemonicendp
>
> This description isn't very clear.  How about "Terminate mnemonicendp"?
>
>
>   Ok to me.
>
> OK with this change.
>
>
> Thank you.
>
> What should be my next step ?
> I can fix a commit message ( to use  "Terminate mnemonicendp" instead "Cleanup mnemonicendp") and resend a patch.
> Or someone else (who will apply my fixes) might change this.
>
>
> -Vladimir
>

I pushed it for you.

-- 
H.J.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-12-18  1:56 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-17 23:26 [PATCH] Cleanup mnemonicendp in swap_operand() vladimir.mezentsev
2021-12-17 23:37 ` H.J. Lu
     [not found]   ` <2e2351bf-3737-7520-ed87-3ffacc0eb8f7@oracle.com>
2021-12-18  1:56     ` H.J. Lu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).