gas .align limit

Alan Modra amodra@gmail.com
Mon May 19 00:34:55 GMT 2025
On Sun, May 18, 2025 at 09:59:08AM +0200, Jan Beulich wrote:
> On 17.05.2025 12:14, Alan Modra wrote:
> > I've been looking at removing any requirement that rs_align_code
> > frags need lots of memory.  They should not, because the patterns of
> > nops used always have repeating sequences, and the repeating part only
> > needs memory for one repeat.  The attached patch cleans up all the
> > target HANDLE_ALIGN code, except for x86_64.  I've left x86 because
> > I'm unsure whether it matters that the short nop sequence is last.  If
> > it doesn't matter then it can be placed first, and the repeating part
> > handled as for all other targets.  If it should remain last then it
> > needs to be moved to a separate frag as is done for the group ending
> > nop on ppc.
> 
> I don't think the ordering really matters, but some testcases may have
> been having respective expectations (which ought to be fine to change).
> Iirc for long enough sequences we may emit JMP, though, and that
> obviously needs to stay first.

OK, the code change is easy, the testsuite changes a pain.
rs_fill_nop ought to be changed similarly too.  Maybe later.

>From cf2ade6c580ec524d815f94a2479434ca3835257 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Mon, 19 May 2025 00:27:54 +0930
Subject: tidy x86 HANDLE_ALIGN

Reduce memory requirement for .align in code.

I've changed some of the tests to use "clc" rather than "nop", so that
code emitted by .p2align can be clearly seen.

	* config/tc-i386.c (i386_output_nops): Put shorter nop first.
	(i386_generate_nops): For rs_align_code make use of the fact
	that the last fr_var bytes are output repeatedly rather than
	repeating them here.
	* config/tc-i386.h (HANDLE_ALIGN): Don't test max_bytes.
	(MAX_MEM_FOR_RS_ALIGN_CODE): Update.
	* testsuite/gas/i386/nops-1.s,
	* testsuite/gas/i386/nops-2.s,
	* testsuite/gas/i386/nops-3.s,
	* testsuite/gas/i386/nops-4.s,
	* testsuite/gas/i386/nops16-1.s: Replace "nop" with "clc".
	* testsuite/gas/i386/align-branch-6.d,
	* testsuite/gas/i386/nop-1-suffix.d,
	* testsuite/gas/i386/nop-1.d,
	* testsuite/gas/i386/nop-1.l,
	* testsuite/gas/i386/nop-2.d,
	* testsuite/gas/i386/nop-4.d,
	* testsuite/gas/i386/nop-5.d,
	* testsuite/gas/i386/nops-1-core2.d,
	* testsuite/gas/i386/nops-1.d,
	* testsuite/gas/i386/nops-10.d,
	* testsuite/gas/i386/nops-2.d,
	* testsuite/gas/i386/nops-3.d,
	* testsuite/gas/i386/nops-4.d,
	* testsuite/gas/i386/nops-4a-i686.d,
	* testsuite/gas/i386/nops-5.d,
	* testsuite/gas/i386/nops-6.d,
	* testsuite/gas/i386/nops-7.d,
	* testsuite/gas/i386/nops-9.d,
	* testsuite/gas/i386/nops16-1.d,
	* testsuite/gas/i386/x86-64-align-branch-6.d,
	* testsuite/gas/i386/x86-64-nop-1.d,
	* testsuite/gas/i386/x86-64-nop-5.d,
	* testsuite/gas/i386/x86-64-nops-1-core2.d,
	* testsuite/gas/i386/x86-64-nops-1-pentium.d,
	* testsuite/gas/i386/x86-64-nops-1.d,
	* testsuite/gas/i386/x86-64-nops-2.d,
	* testsuite/gas/i386/x86-64-nops-3.d,
	* testsuite/gas/i386/x86-64-nops-4-core2.d,
	* testsuite/gas/i386/x86-64-nops-4.d,
	* testsuite/gas/i386/x86-64-nops-5.d,
	* testsuite/gas/i386/x86-64-nops-6.d,
	* testsuite/gas/i386/x86-64-nops-7.d: Adjust to suit.

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 31d4bccaee3..aa8032b3543 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -1552,9 +1552,8 @@ i386_output_nops (char *where, const unsigned char *const *patt,
 		  int count, int max_single_nop_size)
 
 {
-  /* Place the longer NOP first.  */
+  /* Place the shorter NOP first.  */
   int last;
-  int offset;
   const unsigned char *nops;
 
   if (max_single_nop_size < 1)
@@ -1564,17 +1563,20 @@ i386_output_nops (char *where, const unsigned char *const *patt,
       return;
     }
 
-  nops = patt[max_single_nop_size - 1];
   last = count % max_single_nop_size;
-
-  count -= last;
-  for (offset = 0; offset < count; offset += max_single_nop_size)
-    memcpy (where + offset, nops, max_single_nop_size);
-
   if (last)
     {
-      nops = patt[last - 1];
-      memcpy (where + offset, nops, last);
+      memcpy (where, patt[last - 1], last);
+      where += last;
+      count -= last;
+    }
+
+  nops = patt[max_single_nop_size - 1];
+  while (count)
+    {
+      memcpy (where, nops, max_single_nop_size);
+      where += max_single_nop_size;
+      count -= max_single_nop_size;
     }
 }
 
@@ -1745,8 +1747,6 @@ i386_generate_nops (fragS *fragP, char *where, offsetT count, int limit)
 	  return;
 	}
     }
-  else if (fragP->fr_type != rs_machine_dependent)
-    fragP->fr_var = count;
 
   /* Emit a plain NOP first when the last thing we saw may not have been
      a proper instruction (e.g. a stand-alone prefix or .byte).  */
@@ -1797,6 +1797,19 @@ i386_generate_nops (fragS *fragP, char *where, offsetT count, int limit)
 	}
     }
 
+  if (fragP->fr_type == rs_align_code)
+    {
+      /* Set up the rs_code_align frag so that everything we have
+	 emitted so far here plus the smaller nop emitted first by
+	 i386_output_nops is included in fr_fix.  The repeating larger
+	 nop only needs to be written once to the frag.  */
+      valueT non_repeat = count % limit;
+      fragP->fr_fix = where - fragP->fr_literal + non_repeat;
+      fragP->fr_var = limit;
+      if (count > limit)
+	count = limit + non_repeat;
+    }
+
   /* Generate multiple NOPs.  */
   i386_output_nops (where, patt, count, limit);
 }
diff --git a/gas/config/tc-i386.h b/gas/config/tc-i386.h
index 19eb0bcecf2..4ad5a00a861 100644
--- a/gas/config/tc-i386.h
+++ b/gas/config/tc-i386.h
@@ -230,9 +230,6 @@ if ((n)									\
     goto around;							\
   }
 
-#define MAX_MEM_FOR_RS_ALIGN_CODE \
-  (alignment ? ((size_t) 1 << alignment) - 1 : (size_t) 1)
-
 extern void i386_cons_align (int);
 #define md_cons_align(nbytes) i386_cons_align (nbytes)
 
@@ -385,11 +382,14 @@ if (fragP->fr_type == rs_align_code) 					\
     offsetT __count = (fragP->fr_next->fr_address			\
 		       - fragP->fr_address				\
 		       - fragP->fr_fix);				\
-    if (__count > 0							\
-	&& (unsigned int) __count <= fragP->tc_frag_data.max_bytes)	\
+    if (__count > 0)							\
       md_generate_nops (fragP, fragP->fr_literal + fragP->fr_fix,	\
 			__count, 0);					\
   }
+/* Possible plain nop, branch, twice largest nop less 1.
+   Yes, the branch might be one byte longer in CODE_16BIT but then the
+   largest nop is smaller.  */
+#define MAX_MEM_FOR_RS_ALIGN_CODE (1 + 5 + 2 * 15 - 1)
 
 /* We want .cfi_* pseudo-ops for generating unwind info.  */
 #define TARGET_USE_CFIPOP 1
diff --git a/gas/testsuite/gas/i386/align-branch-6.d b/gas/testsuite/gas/i386/align-branch-6.d
index 11dc03cd92e..cd0a162ab84 100644
--- a/gas/testsuite/gas/i386/align-branch-6.d
+++ b/gas/testsuite/gas/i386/align-branch-6.d
@@ -8,6 +8,7 @@ Disassembly of section .text:
 
 0+ <_start>:
  +[a-f0-9]+:	eb 3c                	jmp    3e <_start\+0x3e>
+ +[a-f0-9]+:	8d 74 26 00          	lea    0x0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
@@ -15,7 +16,6 @@ Disassembly of section .text:
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
- +[a-f0-9]+:	8d 74 26 00          	lea    0x0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	f2 73 bf             	bnd jae 0 <_start>
  +[a-f0-9]+:	c3                   	ret
 #pass
diff --git a/gas/testsuite/gas/i386/nop-1-suffix.d b/gas/testsuite/gas/i386/nop-1-suffix.d
index dbea21b1939..ff9c7eee12f 100644
--- a/gas/testsuite/gas/i386/nop-1-suffix.d
+++ b/gas/testsuite/gas/i386/nop-1-suffix.d
@@ -21,19 +21,20 @@ Disassembly of section .text:
  +[a-f0-9]+:	8d 74 26 00          	leal   0x0\(%esi,%eiz,1\),%esi
 
 0+12 <pseudo_20>:
+ +[a-f0-9]+:	8d 74 26 00          	leal   0x0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	leal   %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	leal   %cs:(0x)?0\(%esi,%eiz,1\),%esi
- +[a-f0-9]+:	8d 74 26 00          	leal   0x0\(%esi,%eiz,1\),%esi
 
 0+26 <pseudo_30>:
  +[a-f0-9]+:	eb 1c                	jmp    44 <pseudo_129>
+ +[a-f0-9]+:	8d 74 26 00          	leal   0x0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	leal   %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	leal   %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	leal   %cs:(0x)?0\(%esi,%eiz,1\),%esi
- +[a-f0-9]+:	8d 74 26 00          	leal   0x0\(%esi,%eiz,1\),%esi
 
 0+44 <pseudo_129>:
  +[a-f0-9]+:	eb 7f                	jmp    c5 <end>
+ +[a-f0-9]+:	8d b4 26 00 00 00 00 	leal   0x0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	leal   %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	leal   %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	leal   %cs:(0x)?0\(%esi,%eiz,1\),%esi
@@ -49,7 +50,6 @@ Disassembly of section .text:
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	leal   %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	leal   %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	leal   %cs:(0x)?0\(%esi,%eiz,1\),%esi
- +[a-f0-9]+:	8d b4 26 00 00 00 00 	leal   0x0\(%esi,%eiz,1\),%esi
 
 0+c5 <end>:
  +[a-f0-9]+:	31 c0                	xorl   %eax,%eax
diff --git a/gas/testsuite/gas/i386/nop-1.d b/gas/testsuite/gas/i386/nop-1.d
index 93c7c3a10df..3c5e9469256 100644
--- a/gas/testsuite/gas/i386/nop-1.d
+++ b/gas/testsuite/gas/i386/nop-1.d
@@ -20,19 +20,20 @@ Disassembly of section .text:
  +[a-f0-9]+:	8d 74 26 00          	lea    0x0\(%esi,%eiz,1\),%esi
 
 0+12 <pseudo_20>:
+ +[a-f0-9]+:	8d 74 26 00          	lea    0x0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
- +[a-f0-9]+:	8d 74 26 00          	lea    0x0\(%esi,%eiz,1\),%esi
 
 0+26 <pseudo_30>:
  +[a-f0-9]+:	eb 1c                	jmp    44 <pseudo_129>
+ +[a-f0-9]+:	8d 74 26 00          	lea    0x0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
- +[a-f0-9]+:	8d 74 26 00          	lea    0x0\(%esi,%eiz,1\),%esi
 
 0+44 <pseudo_129>:
  +[a-f0-9]+:	eb 7f                	jmp    c5 <end>
+ +[a-f0-9]+:	8d b4 26 00 00 00 00 	lea    0x0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
@@ -48,7 +49,6 @@ Disassembly of section .text:
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
- +[a-f0-9]+:	8d b4 26 00 00 00 00 	lea    0x0\(%esi,%eiz,1\),%esi
 
 0+c5 <end>:
  +[a-f0-9]+:	31 c0                	xor    %eax,%eax
diff --git a/gas/testsuite/gas/i386/nop-1.l b/gas/testsuite/gas/i386/nop-1.l
index a8187086692..39260bba1da 100644
--- a/gas/testsuite/gas/i386/nop-1.l
+++ b/gas/testsuite/gas/i386/nop-1.l
@@ -15,25 +15,25 @@
 [ 	]*[0-9]+[ 	]+8D742600 *
 [ 	]*[0-9]+[ 	]*
 [ 	]*[0-9]+[ 	]+pseudo_20:
-[ 	]*[0-9]+[ 	]+.... 2E8DB426[ 	]+\.nops 20
+[ 	]*[0-9]+[ 	]+.... 8D742600[ 	]+\.nops 20
+[ 	]*[0-9]+[ 	]+2E8DB426 *
 [ 	]*[0-9]+[ 	]+00000000 *
 [ 	]*[0-9]+[ 	]+2E8DB426 *
 [ 	]*[0-9]+[ 	]+00000000 *
-[ 	]*[0-9]+[ 	]+8D742600 *
 [ 	]*[0-9]+[ 	]*
 [ 	]*[0-9]+[ 	]+pseudo_30:
-[ 	]*[0-9]+[ 	]+.... EB1C2E8D[ 	]+\.nops 30
+[ 	]*[0-9]+[ 	]+.... EB1C8D74[ 	]+\.nops 30
+[ 	]*[0-9]+[ 	]+26002E8D *
 [ 	]*[0-9]+[ 	]+B4260000 *
 [ 	]*[0-9]+[ 	]+00002E8D *
 [ 	]*[0-9]+[ 	]+B4260000 *
-[ 	]*[0-9]+[ 	]+00002E8D *
 [ 	]*[0-9]+[ 	]*
 [ 	]*[0-9]+[ 	]+pseudo_129:
-[ 	]*[0-9]+[ 	]+.... EB7F2E8D[ 	]+\.nops 129
-[ 	]*[0-9]+[ 	]+B4260000 *
-[ 	]*[0-9]+[ 	]+00002E8D *
-[ 	]*[0-9]+[ 	]+B4260000 *
-[ 	]*[0-9]+[ 	]+00002E8D *
+[ 	]*[0-9]+[ 	]+.... EB7F8DB4[ 	]+\.nops 129
+[ 	]*[0-9]+[ 	]+26000000 *
+[ 	]*[0-9]+[ 	]+002E8DB4 *
+[ 	]*[0-9]+[ 	]+26000000 *
+[ 	]*[0-9]+[ 	]+002E8DB4 *
 [ 	]*[0-9]+[ 	]*
 [ 	]*[0-9]+[ 	]+end:
 #pass
diff --git a/gas/testsuite/gas/i386/nop-2.d b/gas/testsuite/gas/i386/nop-2.d
index d87ab7e39e9..f29df32d2be 100644
--- a/gas/testsuite/gas/i386/nop-2.d
+++ b/gas/testsuite/gas/i386/nop-2.d
@@ -13,8 +13,8 @@ Disassembly of section .text:
  +[a-f0-9]+:	90                   	nop
 
 0+2 <pseudo_8>:
- +[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
  +[a-f0-9]+:	8d 74 00             	lea    (0x)?0\(%si\),%si
+ +[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 
 0+a <pseudo_8_4>:
  +[a-f0-9]+:	8d b4 00 00          	lea    0x0\(%si\),%si
@@ -22,22 +22,23 @@ Disassembly of section .text:
 
 0+12 <pseudo_20>:
  +[a-f0-9]+:	eb 12                	jmp    26 <pseudo_30>
+ +[a-f0-9]+:	8d 74 00             	lea    (0x)?0\(%si\),%si
  +[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
  +[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
  +[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
- +[a-f0-9]+:	8d 74 00             	lea    (0x)?0\(%si\),%si
 
 0+26 <pseudo_30>:
  +[a-f0-9]+:	eb 1c                	jmp    44 <pseudo_129>
+ +[a-f0-9]+:	8d 74 00             	lea    (0x)?0\(%si\),%si
  +[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
  +[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
  +[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
  +[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
  +[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
- +[a-f0-9]+:	8d 74 00             	lea    (0x)?0\(%si\),%si
 
 0+44 <pseudo_129>:
  +[a-f0-9]+:	eb 7f                	jmp    c5 <end>
+ +[a-f0-9]+:	89 f6                	mov    %si,%si
  +[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
  +[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
  +[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
@@ -63,7 +64,6 @@ Disassembly of section .text:
  +[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
  +[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
  +[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
- +[a-f0-9]+:	89 f6                	mov    %si,%si
 
 0+c5 <end>:
  +[a-f0-9]+:	66 31 c0             	xor    %eax,%eax
diff --git a/gas/testsuite/gas/i386/nop-4.d b/gas/testsuite/gas/i386/nop-4.d
index 595365216e5..5f9e0b987a8 100644
--- a/gas/testsuite/gas/i386/nop-4.d
+++ b/gas/testsuite/gas/i386/nop-4.d
@@ -9,8 +9,8 @@ Disassembly of section .text:
 0+ <_start>:
  +[a-f0-9]+:	31 c0                	xor    %eax,%eax
  +[a-f0-9]+:	85 c0                	test   %eax,%eax
- +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	31 c0                	xor    %eax,%eax
  +[a-f0-9]+:	31 c0                	xor    %eax,%eax
 
diff --git a/gas/testsuite/gas/i386/nop-5.d b/gas/testsuite/gas/i386/nop-5.d
index 193e0cd3774..71f125967d5 100644
--- a/gas/testsuite/gas/i386/nop-5.d
+++ b/gas/testsuite/gas/i386/nop-5.d
@@ -9,9 +9,9 @@ Disassembly of section .text:
 0+ <_start>:
  +[a-f0-9]+:	31 c0                	xor    %eax,%eax
  +[a-f0-9]+:	85 c0                	test   %eax,%eax
+ +[a-f0-9]+:	90                   	nop
  +[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
- +[a-f0-9]+:	90                   	nop
  +[a-f0-9]+:	31 c0                	xor    %eax,%eax
  +[a-f0-9]+:	31 c0                	xor    %eax,%eax
 
diff --git a/gas/testsuite/gas/i386/nops-1-core2.d b/gas/testsuite/gas/i386/nops-1-core2.d
index bd5ad377e67..c78332419e3 100644
--- a/gas/testsuite/gas/i386/nops-1-core2.d
+++ b/gas/testsuite/gas/i386/nops-1-core2.d
@@ -9,153 +9,153 @@
 Disassembly of section .text:
 
 0+ <nop15>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 40 00          	nopl   0x0\(%eax\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 
 0+10 <nop14>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 00             	nopl   \(%eax\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 
 0+20 <nop13>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 
 0+30 <nop12>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	90                   	nop
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
-[ 	]*[a-f0-9]+:	90                   	nop
 
 0+40 <nop11>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 
 0+50 <nop10>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 2e 0f 1f 84 00 00 00 00 00 	nopw   %cs:0x0\(%eax,%eax,1\)
 
 0+60 <nop9>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 0f 1f 84 00 00 00 00 00 	nopw   0x0\(%eax,%eax,1\)
 
 0+70 <nop8>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 84 00 00 00 00 00 	nopl   0x0\(%eax,%eax,1\)
 
 0+80 <nop7>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 80 00 00 00 00 	nopl   0x0\(%eax\)
 
 0+90 <nop6>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 0f 1f 44 00 00    	nopw   0x0\(%eax,%eax,1\)
 
 0+a0 <nop5>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%eax,%eax,1\)
 
 0+b0 <nop4>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 40 00          	nopl   0x0\(%eax\)
 
 0+c0 <nop3>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 00             	nopl   \(%eax\)
 
 0+d0 <nop2>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
 #pass
diff --git a/gas/testsuite/gas/i386/nops-1.d b/gas/testsuite/gas/i386/nops-1.d
index ff6444a1776..71c17213e86 100644
--- a/gas/testsuite/gas/i386/nops-1.d
+++ b/gas/testsuite/gas/i386/nops-1.d
@@ -8,156 +8,156 @@
 Disassembly of section .text:
 
 0+ <nop15>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	8d b4 26 00 00 00 00 	lea    0x0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+10 <nop14>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	8d b6 00 00 00 00    	lea    (0x)?0\(%esi\),%esi
+ +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+20 <nop13>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+30 <nop12>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	8d 74 26 00          	lea    (0x)?0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+40 <nop11>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	8d 76 00             	lea    (0x)?0\(%esi\),%esi
+ +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+50 <nop10>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	66 90                	xchg   %ax,%ax
+ +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+60 <nop9>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	90                   	nop
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
- +[a-f0-9]+:	90                   	nop
 
 0+70 <nop8>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+80 <nop7>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	8d b4 26 00 00 00 00 	lea    0x0\(%esi,%eiz,1\),%esi
 
 0+90 <nop6>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	8d b6 00 00 00 00    	lea    0x0\(%esi\),%esi
 
 0+a0 <nop5>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+b0 <nop4>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	8d 74 26 00          	lea    0x0\(%esi,%eiz,1\),%esi
 
 0+c0 <nop3>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	8d 76 00             	lea    0x0\(%esi\),%esi
 
 0+d0 <nop2>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	66 90                	xchg   %ax,%ax
 #pass
diff --git a/gas/testsuite/gas/i386/nops-1.s b/gas/testsuite/gas/i386/nops-1.s
index a4fd7694de7..77cb9a889ce 100644
--- a/gas/testsuite/gas/i386/nops-1.s
+++ b/gas/testsuite/gas/i386/nops-1.s
@@ -1,147 +1,147 @@
 	.text
 nop15:
-	nop
+	clc
 	.p2align 4
 
 nop14:
-	nop
-	nop
+	clc
+	clc
 	.p2align 4
 
 nop13:
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop12:
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop11:
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop10:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop9:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop8:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop7:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop6:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop5:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop4:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop3:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop2:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
diff --git a/gas/testsuite/gas/i386/nops-10.d b/gas/testsuite/gas/i386/nops-10.d
index be9d4f7d334..6aeaaa01978 100644
--- a/gas/testsuite/gas/i386/nops-10.d
+++ b/gas/testsuite/gas/i386/nops-10.d
@@ -8,6 +8,6 @@ Disassembly of section .text:
 
 0+ <default>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 #pass
diff --git a/gas/testsuite/gas/i386/nops-2.d b/gas/testsuite/gas/i386/nops-2.d
index 79baee54771..b7c1d81d97f 100644
--- a/gas/testsuite/gas/i386/nops-2.d
+++ b/gas/testsuite/gas/i386/nops-2.d
@@ -9,160 +9,160 @@ Disassembly of section .text:
 
 0+ <nop>:
  +[a-f0-9]+:	0f be f0             	movsbl %al,%esi
- +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+10 <nop15>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	8d b4 26 00 00 00 00 	lea    (0x)?0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+20 <nop14>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	8d b6 00 00 00 00    	lea    (0x)?0\(%esi\),%esi
+ +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+30 <nop13>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+40 <nop12>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	8d 74 26 00          	lea    (0x)?0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+50 <nop11>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	8d 76 00             	lea    (0x)?0\(%esi\),%esi
+ +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+60 <nop10>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	66 90                	xchg   %ax,%ax
+ +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+70 <nop9>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	90                   	nop
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
- +[a-f0-9]+:	90                   	nop
 
 0+80 <nop8>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+90 <nop7>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	8d b4 26 00 00 00 00 	lea    0x0\(%esi,%eiz,1\),%esi
 
 0+a0 <nop6>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	8d b6 00 00 00 00    	lea    0x0\(%esi\),%esi
 
 0+b0 <nop5>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+c0 <nop4>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	8d 74 26 00          	lea    0x0\(%esi,%eiz,1\),%esi
 
 0+d0 <nop3>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	8d 76 00             	lea    0x0\(%esi\),%esi
 
 0+e0 <nop2>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	66 90                	xchg   %ax,%ax
 #pass
diff --git a/gas/testsuite/gas/i386/nops-2.s b/gas/testsuite/gas/i386/nops-2.s
index 6de16f2b105..23466e21f5a 100644
--- a/gas/testsuite/gas/i386/nops-2.s
+++ b/gas/testsuite/gas/i386/nops-2.s
@@ -4,148 +4,148 @@ nop:
 	.p2align 4
 
 nop15:
-	nop
+	clc
 	.p2align 4
 
 nop14:
-	nop
-	nop
+	clc
+	clc
 	.p2align 4
 
 nop13:
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop12:
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop11:
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop10:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop9:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop8:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop7:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop6:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop5:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop4:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop3:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop2:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
diff --git a/gas/testsuite/gas/i386/nops-3.d b/gas/testsuite/gas/i386/nops-3.d
index 2de34bd57b8..d0539b0febb 100644
--- a/gas/testsuite/gas/i386/nops-3.d
+++ b/gas/testsuite/gas/i386/nops-3.d
@@ -8,13 +8,13 @@
 Disassembly of section .text:
 
 0+ <nop>:
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 1d                	jmp    20 <nop\+0x20>
+[ 	]*[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
-[ 	]*[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	89 c3                	mov    %eax,%ebx
-[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	8d b6 00 00 00 00    	lea    (0x)?0\(%esi\),%esi
+[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 #pass
diff --git a/gas/testsuite/gas/i386/nops-3.s b/gas/testsuite/gas/i386/nops-3.s
index c42b354788b..293758a2e93 100644
--- a/gas/testsuite/gas/i386/nops-3.s
+++ b/gas/testsuite/gas/i386/nops-3.s
@@ -1,6 +1,6 @@
 	.text
 nop:
-	nop
+	clc
 	.p2align 5
 	mov %eax,%ebx
 	.p2align 4
diff --git a/gas/testsuite/gas/i386/nops-4.d b/gas/testsuite/gas/i386/nops-4.d
index b311db202df..8afbb17822e 100644
--- a/gas/testsuite/gas/i386/nops-4.d
+++ b/gas/testsuite/gas/i386/nops-4.d
@@ -7,230 +7,230 @@
 Disassembly of section .text:
 
 0+ <nop31>:
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 1d                	jmp    20 <nop30>
+[ 	]*[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
-[ 	]*[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+20 <nop30>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 1c                	jmp    40 <nop29>
+[ 	]*[a-f0-9]+:	8d 74 26 00          	lea    (0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
-[ 	]*[a-f0-9]+:	8d 74 26 00          	lea    (0x)?0\(%esi,%eiz,1\),%esi
 
 0+40 <nop29>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 1b                	jmp    60 <nop28>
+[ 	]*[a-f0-9]+:	8d 76 00             	lea    (0x)?0\(%esi\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
-[ 	]*[a-f0-9]+:	8d 76 00             	lea    (0x)?0\(%esi\),%esi
 
 0+60 <nop28>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 1a                	jmp    80 <nop27>
+[ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
-[ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
 
 0+80 <nop27>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 19                	jmp    a0 <nop26>
+[ 	]*[a-f0-9]+:	90                   	nop
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
-[ 	]*[a-f0-9]+:	90                   	nop
 
 0+a0 <nop26>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 18                	jmp    c0 <nop25>
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+c0 <nop25>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 17                	jmp    e0 <nop24>
+[ 	]*[a-f0-9]+:	8d b4 26 00 00 00 00 	lea    (0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
-[ 	]*[a-f0-9]+:	8d b4 26 00 00 00 00 	lea    (0x)?0\(%esi,%eiz,1\),%esi
 
 0+e0 <nop24>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 16                	jmp    100 <nop23>
+[ 	]*[a-f0-9]+:	8d b6 00 00 00 00    	lea    (0x)?0\(%esi\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
-[ 	]*[a-f0-9]+:	8d b6 00 00 00 00    	lea    (0x)?0\(%esi\),%esi
 
 0+100 <nop23>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	8d b4 26 00 00 00 00 	lea    (0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
-[ 	]*[a-f0-9]+:	8d b4 26 00 00 00 00 	lea    (0x)?0\(%esi,%eiz,1\),%esi
 
 0+120 <nop22>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	8d b6 00 00 00 00    	lea    (0x)?0\(%esi\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
-[ 	]*[a-f0-9]+:	8d b6 00 00 00 00    	lea    (0x)?0\(%esi\),%esi
 
 0+140 <nop21>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
-[ 	]*[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+160 <nop20>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	8d 74 26 00          	lea    (0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
-[ 	]*[a-f0-9]+:	8d 74 26 00          	lea    (0x)?0\(%esi,%eiz,1\),%esi
 
 0+180 <nop19>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	8d 76 00             	lea    (0x)?0\(%esi\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
-[ 	]*[a-f0-9]+:	8d 76 00             	lea    (0x)?0\(%esi\),%esi
 
 0+1a0 <nop18>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
-[ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
 
 0+1c0 <nop17>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	90                   	nop
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
-[ 	]*[a-f0-9]+:	90                   	nop
 
 0+1e0 <nop16>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 #pass
diff --git a/gas/testsuite/gas/i386/nops-4.s b/gas/testsuite/gas/i386/nops-4.s
index 103ca3604ed..b455f4956aa 100644
--- a/gas/testsuite/gas/i386/nops-4.s
+++ b/gas/testsuite/gas/i386/nops-4.s
@@ -1,187 +1,187 @@
 	.text
 
 nop31:
-	nop
+	clc
 	.p2align 5
 
 nop30:
-	nop
-	nop
+	clc
+	clc
 	.p2align 5
 
 nop29:
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop28:
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop27:
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop26:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop25:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop24:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop23:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop22:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop21:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop20:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop19:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop18:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop17:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop16:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 align:
diff --git a/gas/testsuite/gas/i386/nops-4a-i686.d b/gas/testsuite/gas/i386/nops-4a-i686.d
index dfd3217a9b8..56ce6d7ab9f 100644
--- a/gas/testsuite/gas/i386/nops-4a-i686.d
+++ b/gas/testsuite/gas/i386/nops-4a-i686.d
@@ -8,211 +8,211 @@
 Disassembly of section .text:
 
 0+ <nop31>:
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	66 0f 1f 84 00 00 00 00 00 	nopw   0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
-[ 	]*[a-f0-9]+:	66 0f 1f 84 00 00 00 00 00 	nopw   0x0\(%eax,%eax,1\)
 
 0+20 <nop30>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	0f 1f 84 00 00 00 00 00 	nopl   0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
-[ 	]*[a-f0-9]+:	0f 1f 84 00 00 00 00 00 	nopl   0x0\(%eax,%eax,1\)
 
 0+40 <nop29>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	0f 1f 80 00 00 00 00 	nopl   0x0\(%eax\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
-[ 	]*[a-f0-9]+:	0f 1f 80 00 00 00 00 	nopl   0x0\(%eax\)
 
 0+60 <nop28>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	66 0f 1f 44 00 00    	nopw   0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
-[ 	]*[a-f0-9]+:	66 0f 1f 44 00 00    	nopw   0x0\(%eax,%eax,1\)
 
 0+80 <nop27>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
-[ 	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%eax,%eax,1\)
 
 0+a0 <nop26>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	0f 1f 40 00          	nopl   0x0\(%eax\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
-[ 	]*[a-f0-9]+:	0f 1f 40 00          	nopl   0x0\(%eax\)
 
 0+c0 <nop25>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	0f 1f 00             	nopl   \(%eax\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
-[ 	]*[a-f0-9]+:	0f 1f 00             	nopl   \(%eax\)
 
 0+e0 <nop24>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
-[ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
 
 0+100 <nop23>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	90                   	nop
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
-[ 	]*[a-f0-9]+:	90                   	nop
 
 0+120 <nop22>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 
 0+140 <nop21>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 2e 0f 1f 84 00 00 00 00 00 	nopw   %cs:0x0\(%eax,%eax,1\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 
 0+160 <nop20>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 0f 1f 84 00 00 00 00 00 	nopw   0x0\(%eax,%eax,1\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 
 0+180 <nop19>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 84 00 00 00 00 00 	nopl   0x0\(%eax,%eax,1\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 
 0+1a0 <nop18>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 80 00 00 00 00 	nopl   0x0\(%eax\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 
 0+1c0 <nop17>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 0f 1f 44 00 00    	nopw   0x0\(%eax,%eax,1\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 
 0+1e0 <nop16>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%eax,%eax,1\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 #pass
diff --git a/gas/testsuite/gas/i386/nops-5.d b/gas/testsuite/gas/i386/nops-5.d
index d87f9504f1c..7ca694ea12c 100644
--- a/gas/testsuite/gas/i386/nops-5.d
+++ b/gas/testsuite/gas/i386/nops-5.d
@@ -7,71 +7,71 @@ Disassembly of section .text:
 
 0+ <i386>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+10 <i486>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+20 <i586>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+30 <i686>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+40 <pentium4>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 
 0+50 <nocona>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 
 0+60 <core>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 
 0+70 <core2>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 
 0+80 <k6>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+90 <athlon>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 
 0+a0 <k8>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 
 0+b0 <generic32>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+c0 <generic64>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 
 0+d0 <amdfam10>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 #pass
diff --git a/gas/testsuite/gas/i386/nops-6.d b/gas/testsuite/gas/i386/nops-6.d
index c56c9d1d989..7dfb7304aca 100644
--- a/gas/testsuite/gas/i386/nops-6.d
+++ b/gas/testsuite/gas/i386/nops-6.d
@@ -7,11 +7,11 @@ Disassembly of section .text:
 
 0+ <i386>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+10 <i386_nop>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 #pass
diff --git a/gas/testsuite/gas/i386/nops-7.d b/gas/testsuite/gas/i386/nops-7.d
index 2290ab7372d..1ae8efadcf8 100644
--- a/gas/testsuite/gas/i386/nops-7.d
+++ b/gas/testsuite/gas/i386/nops-7.d
@@ -8,6 +8,7 @@ Disassembly of section .text:
 0+ <_start>:
  +[a-f0-9]+:	31 c0                	xor    %eax,%eax
  +[a-f0-9]+:	e9 f9 01 00 00       	jmp    200 <func1>
+ +[a-f0-9]+:	90                   	nop
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
@@ -71,11 +72,11 @@ Disassembly of section .text:
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
- +[a-f0-9]+:	90                   	nop
 
 0+200 <func1>:
  +[a-f0-9]+:	31 db                	xor    %ebx,%ebx
  +[a-f0-9]+:	e9 f9 00 00 00       	jmp    300 <func2>
+ +[a-f0-9]+:	90                   	nop
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
@@ -107,11 +108,11 @@ Disassembly of section .text:
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
- +[a-f0-9]+:	90                   	nop
 
 0+300 <func2>:
  +[a-f0-9]+:	31 db                	xor    %ebx,%ebx
  +[a-f0-9]+:	eb 7c                	jmp    380 <func3>
+ +[a-f0-9]+:	8d 74 26 00          	lea    0x0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
@@ -127,11 +128,11 @@ Disassembly of section .text:
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
- +[a-f0-9]+:	8d 74 26 00          	lea    0x0\(%esi,%eiz,1\),%esi
 
 0+380 <func3>:
  +[a-f0-9]+:	31 c9                	xor    %ecx,%ecx
  +[a-f0-9]+:	eb 3c                	jmp    3c0 <func4>
+ +[a-f0-9]+:	8d 74 26 00          	lea    0x0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
@@ -139,15 +140,14 @@ Disassembly of section .text:
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
- +[a-f0-9]+:	8d 74 26 00          	lea    0x0\(%esi,%eiz,1\),%esi
 
 0+3c0 <func4>:
  +[a-f0-9]+:	31 d2                	xor    %edx,%edx
  +[a-f0-9]+:	eb 1c                	jmp    3e0 <func5>
+ +[a-f0-9]+:	8d 74 26 00          	lea    0x0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
- +[a-f0-9]+:	8d 74 26 00          	lea    0x0\(%esi,%eiz,1\),%esi
 
 0+3e0 <func5>:
  +[a-f0-9]+:	31 ff                	xor    %edi,%edi
diff --git a/gas/testsuite/gas/i386/nops-9.d b/gas/testsuite/gas/i386/nops-9.d
index ba8707fc484..62fc9549cc6 100644
--- a/gas/testsuite/gas/i386/nops-9.d
+++ b/gas/testsuite/gas/i386/nops-9.d
@@ -7,21 +7,21 @@ Disassembly of section .text:
 
 0+ <default>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+10 <nopopcnt>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d 74 26 00       	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
+[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+20 <popcnt>:
 [ 	]*[a-f0-9]+:	f3 0f b8 f0          	popcnt %eax,%esi
-[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 [ 	]*[a-f0-9]+:	8d 74 26 00          	lea    (0x)?0\(%esi,%eiz,1\),%esi
+[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	lea    %cs:(0x)?0\(%esi,%eiz,1\),%esi
 
 0+30 <nop>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 nopw %cs:0x0\(%eax,%eax,1\)
 #pass
diff --git a/gas/testsuite/gas/i386/nops16-1.d b/gas/testsuite/gas/i386/nops16-1.d
index 5cc860b2c0f..dd1219e3e60 100644
--- a/gas/testsuite/gas/i386/nops16-1.d
+++ b/gas/testsuite/gas/i386/nops16-1.d
@@ -7,57 +7,57 @@
 Disassembly of section .text:
 
 0+ <nop31>:
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 1d                	jmp    20 <nop30>
+[ 	]*[a-f0-9]+:	8d b4 00 00          	lea    0x0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	8d b4 00 00          	lea    0x0\(%si\),%si
 
 0+20 <nop30>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 1c                	jmp    40 <nop29>
+[ 	]*[a-f0-9]+:	8d 74 00             	lea    (0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	8d 74 00             	lea    (0x)?0\(%si\),%si
 
 0+40 <nop29>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 1b                	jmp    60 <nop28>
+[ 	]*[a-f0-9]+:	89 f6                	mov    %si,%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	89 f6                	mov    %si,%si
 
 0+60 <nop28>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 1a                	jmp    80 <nop27>
+[ 	]*[a-f0-9]+:	90                   	nop
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	90                   	nop
 
 0+80 <nop27>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 19                	jmp    a0 <nop26>
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
@@ -66,78 +66,78 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 
 0+a0 <nop26>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 18                	jmp    c0 <nop25>
+[ 	]*[a-f0-9]+:	8d b4 00 00          	lea    (0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	8d b4 00 00          	lea    (0x)?0\(%si\),%si
 
 0+c0 <nop25>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 17                	jmp    e0 <nop24>
+[ 	]*[a-f0-9]+:	8d 74 00             	lea    (0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	8d 74 00             	lea    (0x)?0\(%si\),%si
 
 0+e0 <nop24>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 16                	jmp    100 <nop23>
+[ 	]*[a-f0-9]+:	89 f6                	mov    %si,%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	89 f6                	mov    %si,%si
 
 0+100 <nop23>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 15                	jmp    120 <nop22>
+[ 	]*[a-f0-9]+:	90                   	nop
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	90                   	nop
 
 0+120 <nop22>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 14                	jmp    140 <nop21>
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
@@ -145,286 +145,286 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 
 0+140 <nop21>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 13                	jmp    160 <nop20>
+[ 	]*[a-f0-9]+:	8d b4 00 00          	lea    (0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	8d b4 00 00          	lea    (0x)?0\(%si\),%si
 
 0+160 <nop20>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 12                	jmp    180 <nop19>
+[ 	]*[a-f0-9]+:	8d 74 00             	lea    (0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	8d 74 00             	lea    (0x)?0\(%si\),%si
 
 0+180 <nop19>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 11                	jmp    1a0 <nop18>
+[ 	]*[a-f0-9]+:	89 f6                	mov    %si,%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	89 f6                	mov    %si,%si
 
 0+1a0 <nop18>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 10                	jmp    1c0 <nop17>
+[ 	]*[a-f0-9]+:	90                   	nop
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	90                   	nop
 
 0+1c0 <nop17>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 0f                	jmp    1e0 <nop16>
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 
 0+1e0 <nop16>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 0e                	jmp    200 <nop15>
+[ 	]*[a-f0-9]+:	8d b4 00 00          	lea    (0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	8d b4 00 00          	lea    (0x)?0\(%si\),%si
 
 0+200 <nop15>:
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	eb 0d                	jmp    210 <nop14>
+[ 	]*[a-f0-9]+:	8d 74 00             	lea    (0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	8d 74 00             	lea    (0x)?0\(%si\),%si
 
 0+210 <nop14>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	8d b4 00 00          	lea    (0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	8d b4 00 00          	lea    (0x)?0\(%si\),%si
 
 0+220 <nop13>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	8d 74 00             	lea    (0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	8d 74 00             	lea    (0x)?0\(%si\),%si
 
 0+230 <nop12>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	89 f6                	mov    %si,%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	89 f6                	mov    %si,%si
 
 0+240 <nop11>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	90                   	nop
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	90                   	nop
 
 0+250 <nop10>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 
 0+260 <nop9>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	8d b4 00 00          	lea    (0x)?0\(%si\),%si
+[ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 
 0+270 <nop8>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	8d 74 00             	lea    (0x)?0\(%si\),%si
+[ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 
 0+280 <nop7>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	89 f6                	mov    %si,%si
+[ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 
 0+290 <nop6>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	90                   	nop
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
-[ 	]*[a-f0-9]+:	90                   	nop
 
 0+2a0 <nop5>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	2e 8d b4 00 00       	lea    %cs:(0x)?0\(%si\),%si
 
 0+2b0 <nop4>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	8d b4 00 00          	lea    0x0\(%si\),%si
 
 0+2c0 <nop3>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	8d 74 00             	lea    0x0\(%si\),%si
 
 0+2d0 <nop2>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	89 f6                	mov    %si,%si
 #pass
diff --git a/gas/testsuite/gas/i386/nops16-1.s b/gas/testsuite/gas/i386/nops16-1.s
index 8e13bb67dc5..570711d5edf 100644
--- a/gas/testsuite/gas/i386/nops16-1.s
+++ b/gas/testsuite/gas/i386/nops16-1.s
@@ -1,332 +1,332 @@
 	.text
 	.code16
 nop31:
-	nop
+	clc
 	.p2align 5
 
 nop30:
-	nop
-	nop
+	clc
+	clc
 	.p2align 5
 
 nop29:
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop28:
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop27:
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop26:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop25:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop24:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop23:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop22:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop21:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop20:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop19:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop18:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop17:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop16:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 5
 
 nop15:
-	nop
+	clc
 	.p2align 4
 
 nop14:
-	nop
-	nop
+	clc
+	clc
 	.p2align 4
 
 nop13:
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop12:
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop11:
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop10:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop9:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop8:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop7:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop6:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop5:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop4:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop3:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
 
 nop2:
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
+	clc
 	.p2align 4
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-6.d b/gas/testsuite/gas/i386/x86-64-align-branch-6.d
index 01a28aef971..f198401b1e8 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-6.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-6.d
@@ -8,12 +8,12 @@
 Disassembly of section .text:
 
 0+ <_start>:
+ +[a-f0-9]+:	0f 1f 80 00 00 00 00 	nopl   0x0\(%rax\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
- +[a-f0-9]+:	0f 1f 80 00 00 00 00 	nopl   0x0\(%rax\)
  +[a-f0-9]+:	f2 73 bf             	bnd jae 0 <_start>
  +[a-f0-9]+:	c3                   	ret
 #pass
diff --git a/gas/testsuite/gas/i386/x86-64-nop-1.d b/gas/testsuite/gas/i386/x86-64-nop-1.d
index 5778021ed4e..3e52c70656c 100644
--- a/gas/testsuite/gas/i386/x86-64-nop-1.d
+++ b/gas/testsuite/gas/i386/x86-64-nop-1.d
@@ -21,16 +21,17 @@ Disassembly of section .text:
  +[a-f0-9]+:	0f 1f 40 00          	nopl   0x0\(%rax\)
 
 0+12 <pseudo_20>:
- +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 0f 1f 84 00 00 00 00 00 	nopw   0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+26 <pseudo_30>:
+ +[a-f0-9]+:	0f 1f 84 00 00 00 00 00 	nopl   0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
- +[a-f0-9]+:	0f 1f 84 00 00 00 00 00 	nopl   0x0\(%rax,%rax,1\)
 
 0+44 <pseudo_129>:
  +[a-f0-9]+:	eb 7f                	jmp    c5 <end>
+ +[a-f0-9]+:	66 0f 1f 44 00 00    	nopw   0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
@@ -42,7 +43,6 @@ Disassembly of section .text:
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
- +[a-f0-9]+:	66 0f 1f 44 00 00    	nopw   0x0\(%rax,%rax,1\)
 
 0+c5 <end>:
  +[a-f0-9]+:	31 c0                	xor    %eax,%eax
diff --git a/gas/testsuite/gas/i386/x86-64-nop-5.d b/gas/testsuite/gas/i386/x86-64-nop-5.d
index d5c84c1edf8..b8c0ea77b5e 100644
--- a/gas/testsuite/gas/i386/x86-64-nop-5.d
+++ b/gas/testsuite/gas/i386/x86-64-nop-5.d
@@ -11,9 +11,9 @@ Disassembly of section .text:
 0+ <_start>:
  +[a-f0-9]+:	31 c0                	xor    %eax,%eax
  +[a-f0-9]+:	85 c0                	test   %eax,%eax
+ +[a-f0-9]+:	90                   	nop
  +[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%rax,%rax,1\)
- +[a-f0-9]+:	90                   	nop
  +[a-f0-9]+:	31 c0                	xor    %eax,%eax
  +[a-f0-9]+:	31 c0                	xor    %eax,%eax
 
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-core2.d b/gas/testsuite/gas/i386/x86-64-nops-1-core2.d
index 3fe7f3f6f31..5acc63c08b0 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-1-core2.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-1-core2.d
@@ -9,149 +9,149 @@
 Disassembly of section .text:
 
 0+ <nop15>:
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+10 <nop14>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+20 <nop13>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+30 <nop12>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+40 <nop11>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	66 2e 48 0f 1f 84 00 00 00 00 00 	data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+50 <nop10>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	2e 48 0f 1f 84 00 00 00 00 00 	cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+60 <nop9>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	48 0f 1f 84 00 00 00 00 00 	nopq   (0x)?0\(%rax,%rax,1\)
 
 0+70 <nop8>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	0f 1f 84 00 00 00 00 00 	nopl   (0x)?0\(%rax,%rax,1\)
 
 0+80 <nop7>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	0f 1f 80 00 00 00 00 	nopl   (0x)?0\(%rax\)
 
 0+90 <nop6>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	66 0f 1f 44 00 00    	nopw   (0x)?0\(%rax,%rax,1\)
 
 0+a0 <nop5>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	0f 1f 44 00 00       	nopl   (0x)?0\(%rax,%rax,1\)
 
 0+b0 <nop4>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	0f 1f 40 00          	nopl   (0x)?0\(%rax\)
 
 0+c0 <nop3>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	0f 1f 00             	nopl   \(%rax\)
 
 0+d0 <nop2>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	66 90                	xchg   %ax,%ax
 #pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-pentium.d b/gas/testsuite/gas/i386/x86-64-nops-1-pentium.d
index a8882087923..571ec9501f5 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-1-pentium.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-1-pentium.d
@@ -8,155 +8,155 @@
 Disassembly of section .text:
 
 0+ <nop15>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	2e 48 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%rsi
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	2e 48 8d 74 26 00    	cs lea (0x)?0\(%rsi,%riz,1\),%rsi
+[ 	]*[a-f0-9]+:	2e 48 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%rsi
 
 0+10 <nop14>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	2e 48 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%rsi
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	48 8d 74 26 00       	lea    (0x)?0\(%rsi,%riz,1\),%rsi
+[ 	]*[a-f0-9]+:	2e 48 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%rsi
 
 0+20 <nop13>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	2e 48 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%rsi
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	48 8d 76 00          	lea    (0x)?0\(%rsi\),%rsi
+[ 	]*[a-f0-9]+:	2e 48 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%rsi
 
 0+30 <nop12>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	2e 48 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%rsi
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	48 89 f6             	mov    %rsi,%rsi
+[ 	]*[a-f0-9]+:	2e 48 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%rsi
 
 0+40 <nop11>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	2e 48 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%rsi
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	2e 48 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%rsi
 
 0+50 <nop10>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	90                   	nop
 [ 	]*[a-f0-9]+:	2e 48 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%rsi
-[ 	]*[a-f0-9]+:	90                   	nop
 
 0+60 <nop9>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	2e 48 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%rsi
 
 0+70 <nop8>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	48 8d b4 26 00 00 00 00 	lea    (0x)?0\(%rsi,%riz,1\),%rsi
 
 0+80 <nop7>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	48 8d b6 00 00 00 00 	lea    (0x)?0\(%rsi\),%rsi
 
 0+90 <nop6>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	2e 48 8d 74 26 00    	cs lea (0x)?0\(%rsi,%riz,1\),%rsi
 
 0+a0 <nop5>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	48 8d 74 26 00       	lea    (0x)?0\(%rsi,%riz,1\),%rsi
 
 0+b0 <nop4>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	48 8d 76 00          	lea    (0x)?0\(%rsi\),%rsi
 
 0+c0 <nop3>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	48 89 f6             	mov    %rsi,%rsi
 
 0+d0 <nop2>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
 #pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1.d b/gas/testsuite/gas/i386/x86-64-nops-1.d
index ab99e560c53..45867a4d936 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-1.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-1.d
@@ -8,153 +8,153 @@
 Disassembly of section .text:
 
 0+ <nop15>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 40 00          	nopl   0x0\(%rax\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+10 <nop14>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 00             	nopl   \(%rax\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+20 <nop13>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+30 <nop12>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	90                   	nop
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
-[ 	]*[a-f0-9]+:	90                   	nop
 
 0+40 <nop11>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+50 <nop10>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 2e 0f 1f 84 00 00 00 00 00 	cs nopw 0x0\(%rax,%rax,1\)
 
 0+60 <nop9>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 0f 1f 84 00 00 00 00 00 	nopw   0x0\(%rax,%rax,1\)
 
 0+70 <nop8>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 84 00 00 00 00 00 	nopl   0x0\(%rax,%rax,1\)
 
 0+80 <nop7>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 80 00 00 00 00 	nopl   0x0\(%rax\)
 
 0+90 <nop6>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 0f 1f 44 00 00    	nopw   0x0\(%rax,%rax,1\)
 
 0+a0 <nop5>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%rax,%rax,1\)
 
 0+b0 <nop4>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 40 00          	nopl   0x0\(%rax\)
 
 0+c0 <nop3>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 00             	nopl   \(%rax\)
 
 0+d0 <nop2>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
 #pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-2.d b/gas/testsuite/gas/i386/x86-64-nops-2.d
index fa07de76bf4..b184888daba 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-2.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-2.d
@@ -10,157 +10,157 @@ Disassembly of section .text:
 
 0+ <nop>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+10 <nop15>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 40 00          	nopl   0x0\(%rax\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+20 <nop14>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 00             	nopl   \(%rax\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+30 <nop13>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+40 <nop12>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	90                   	nop
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
-[ 	]*[a-f0-9]+:	90                   	nop
 
 0+50 <nop11>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+60 <nop10>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 2e 0f 1f 84 00 00 00 00 00 	cs nopw 0x0\(%rax,%rax,1\)
 
 0+70 <nop9>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 0f 1f 84 00 00 00 00 00 	nopw   0x0\(%rax,%rax,1\)
 
 0+80 <nop8>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 84 00 00 00 00 00 	nopl   0x0\(%rax,%rax,1\)
 
 0+90 <nop7>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 80 00 00 00 00 	nopl   0x0\(%rax\)
 
 0+a0 <nop6>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 0f 1f 44 00 00    	nopw   0x0\(%rax,%rax,1\)
 
 0+b0 <nop5>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%rax,%rax,1\)
 
 0+c0 <nop4>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 40 00          	nopl   0x0\(%rax\)
 
 0+d0 <nop3>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 00             	nopl   \(%rax\)
 
 0+e0 <nop2>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
 #pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-3.d b/gas/testsuite/gas/i386/x86-64-nops-3.d
index 74c4d9c6046..899affb20f8 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-3.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-3.d
@@ -9,11 +9,11 @@
 Disassembly of section .text:
 
 0+ <nop>:
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	66 0f 1f 84 00 00 00 00 00 	nopw   0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
-[ 	]*[a-f0-9]+:	66 0f 1f 84 00 00 00 00 00 	nopw   0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	89 c3                	mov    %eax,%ebx
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	0f 1f 00             	nopl   \(%rax\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 #pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-4-core2.d b/gas/testsuite/gas/i386/x86-64-nops-4-core2.d
index 8154ca9eb6b..eb5cb160f47 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-4-core2.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-4-core2.d
@@ -9,203 +9,203 @@
 Disassembly of section .text:
 
 0+ <nop31>:
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	90                   	nop
  +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
- +[a-f0-9]+:	90                   	nop
 
 0+20 <nop30>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+40 <nop29>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+60 <nop28>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+80 <nop27>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+a0 <nop26>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	66 2e 48 0f 1f 84 00 00 00 00 00 	data16 cs nopq (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+c0 <nop25>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	2e 48 0f 1f 84 00 00 00 00 00 	cs nopq (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+e0 <nop24>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	48 0f 1f 84 00 00 00 00 00 	nopq   (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+100 <nop23>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	0f 1f 84 00 00 00 00 00 	nopl   (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+120 <nop22>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	0f 1f 80 00 00 00 00 	nopl   (0x)?0\(%rax\)
+ +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+140 <nop21>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	66 0f 1f 44 00 00    	nopw   (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+160 <nop20>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	0f 1f 44 00 00       	nopl   (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+180 <nop19>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	0f 1f 40 00          	nopl   (0x)?0\(%rax\)
+ +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+1a0 <nop18>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	0f 1f 00             	nopl   \(%rax\)
+ +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+1c0 <nop17>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	66 90                	xchg   %ax,%ax
+ +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
 
 0+1e0 <nop16>:
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
- +[a-f0-9]+:	90                   	nop
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
+ +[a-f0-9]+:	f8                   	clc
  +[a-f0-9]+:	90                   	nop
  +[a-f0-9]+:	66 66 66 66 66 2e 48 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 cs nopq (0x)?0\(%rax,%rax,1\)
- +[a-f0-9]+:	90                   	nop
 #pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-4.d b/gas/testsuite/gas/i386/x86-64-nops-4.d
index 7a922c9bb80..778f9b2c606 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-4.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-4.d
@@ -9,211 +9,211 @@
 Disassembly of section .text:
 
 0+ <nop31>:
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	66 0f 1f 84 00 00 00 00 00 	nopw   0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
-[ 	]*[a-f0-9]+:	66 0f 1f 84 00 00 00 00 00 	nopw   0x0\(%rax,%rax,1\)
 
 0+20 <nop30>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	0f 1f 84 00 00 00 00 00 	nopl   0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
-[ 	]*[a-f0-9]+:	0f 1f 84 00 00 00 00 00 	nopl   0x0\(%rax,%rax,1\)
 
 0+40 <nop29>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	0f 1f 80 00 00 00 00 	nopl   0x0\(%rax\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
-[ 	]*[a-f0-9]+:	0f 1f 80 00 00 00 00 	nopl   0x0\(%rax\)
 
 0+60 <nop28>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	66 0f 1f 44 00 00    	nopw   0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
-[ 	]*[a-f0-9]+:	66 0f 1f 44 00 00    	nopw   0x0\(%rax,%rax,1\)
 
 0+80 <nop27>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
-[ 	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%rax,%rax,1\)
 
 0+a0 <nop26>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	0f 1f 40 00          	nopl   0x0\(%rax\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
-[ 	]*[a-f0-9]+:	0f 1f 40 00          	nopl   0x0\(%rax\)
 
 0+c0 <nop25>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	0f 1f 00             	nopl   \(%rax\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
-[ 	]*[a-f0-9]+:	0f 1f 00             	nopl   \(%rax\)
 
 0+e0 <nop24>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
-[ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
 
 0+100 <nop23>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	90                   	nop
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
-[ 	]*[a-f0-9]+:	90                   	nop
 
 0+120 <nop22>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+140 <nop21>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 2e 0f 1f 84 00 00 00 00 00 	cs nopw 0x0\(%rax,%rax,1\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+160 <nop20>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 0f 1f 84 00 00 00 00 00 	nopw   0x0\(%rax,%rax,1\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+180 <nop19>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 84 00 00 00 00 00 	nopl   0x0\(%rax,%rax,1\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+1a0 <nop18>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 80 00 00 00 00 	nopl   0x0\(%rax\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+1c0 <nop17>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	66 0f 1f 44 00 00    	nopw   0x0\(%rax,%rax,1\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+1e0 <nop16>:
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
+[ 	]*[a-f0-9]+:	f8                   	clc
 [ 	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%rax,%rax,1\)
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 #pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-5.d b/gas/testsuite/gas/i386/x86-64-nops-5.d
index 3d188258c2e..290f1d0b622 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-5.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-5.d
@@ -9,71 +9,71 @@ Disassembly of section .text:
 
 0+ <i386>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d 74 26 00       	cs lea (0x)?0\(%rsi,%riz,1\),%esi
+[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%esi
 
 0+10 <i486>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d 74 26 00       	cs lea (0x)?0\(%rsi,%riz,1\),%esi
+[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%esi
 
 0+20 <i586>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d 74 26 00       	cs lea (0x)?0\(%rsi,%riz,1\),%esi
+[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%esi
 
 0+30 <i686>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d 74 26 00       	cs lea (0x)?0\(%rsi,%riz,1\),%esi
+[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%esi
 
 0+40 <pentium4>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+50 <nocona>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+60 <core>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+70 <core2>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+80 <k6>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d 74 26 00       	cs lea (0x)?0\(%rsi,%riz,1\),%esi
+[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%esi
 
 0+90 <athlon>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+a0 <k8>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+b0 <generic32>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%esi
 [ 	]*[a-f0-9]+:	2e 8d 74 26 00       	cs lea (0x)?0\(%rsi,%riz,1\),%esi
+[ 	]*[a-f0-9]+:	2e 8d b4 26 00 00 00 00 	cs lea (0x)?0\(%rsi,%riz,1\),%esi
 
 0+c0 <generic64>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+d0 <amdfam10>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
 #pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-6.d b/gas/testsuite/gas/i386/x86-64-nops-6.d
index e9623501330..94bb9668847 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-6.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-6.d
@@ -8,6 +8,6 @@ Disassembly of section .text:
 
 0+ <default>:
 [ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
-[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw (0x)?0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
+[ 	]*[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw (0x)?0\(%rax,%rax,1\)
 #pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-7.d b/gas/testsuite/gas/i386/x86-64-nops-7.d
index 859dfd8ed7c..d26c2399581 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-7.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-7.d
@@ -10,6 +10,7 @@ Disassembly of section .text:
 0+ <_start>:
  +[a-f0-9]+:	31 c0                	xor    %eax,%eax
  +[a-f0-9]+:	e9 f9 01 00 00       	jmp    200 <func1>
+ +[a-f0-9]+:	66 2e 0f 1f 84 00 00 00 00 00 	cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
@@ -55,11 +56,11 @@ Disassembly of section .text:
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
- +[a-f0-9]+:	66 2e 0f 1f 84 00 00 00 00 00 	cs nopw 0x0\(%rax,%rax,1\)
 
 0+200 <func1>:
  +[a-f0-9]+:	31 db                	xor    %ebx,%ebx
  +[a-f0-9]+:	e9 f9 00 00 00       	jmp    300 <func2>
+ +[a-f0-9]+:	0f 1f 80 00 00 00 00 	nopl   0x0\(%rax\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
@@ -82,11 +83,11 @@ Disassembly of section .text:
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
- +[a-f0-9]+:	0f 1f 80 00 00 00 00 	nopl   0x0\(%rax\)
 
 0+300 <func2>:
  +[a-f0-9]+:	31 db                	xor    %ebx,%ebx
  +[a-f0-9]+:	eb 7c                	jmp    380 <func3>
+ +[a-f0-9]+:	0f 1f 00             	nopl   \(%rax\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
@@ -98,22 +99,21 @@ Disassembly of section .text:
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
- +[a-f0-9]+:	0f 1f 00             	nopl   \(%rax\)
 
 0+380 <func3>:
  +[a-f0-9]+:	31 c9                	xor    %ecx,%ecx
+ +[a-f0-9]+:	0f 1f 80 00 00 00 00 	nopl   0x0\(%rax\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
- +[a-f0-9]+:	0f 1f 80 00 00 00 00 	nopl   0x0\(%rax\)
 
 0+3c0 <func4>:
  +[a-f0-9]+:	31 d2                	xor    %edx,%edx
+ +[a-f0-9]+:	0f 1f 84 00 00 00 00 00 	nopl   0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:	66 66 2e 0f 1f 84 00 00 00 00 00 	data16 cs nopw 0x0\(%rax,%rax,1\)
- +[a-f0-9]+:	0f 1f 84 00 00 00 00 00 	nopl   0x0\(%rax,%rax,1\)
 
 0+3e0 <func5>:
  +[a-f0-9]+:	31 ff                	xor    %edi,%edi

-- 
Alan Modra


More information about the Binutils mailing list