Remove CpuNop from CPU_K6_2_FLAGS

	PR gas/16140
	* i386-gen.c (cpu_flag_init): Remove CpuNop from CPU_K6_2_FLAGS.
	* i386-init.h: Regenerated.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 15266ff2de2ddc1627ec921181088711034b7d4a..a3ceb289c1a848fc293c4361804dc91bc1dbabcc 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR gas/16140
+       * i386-gen.c (cpu_flag_init): Remove CpuNop from CPU_K6_2_FLAGS.
+       * i386-init.h: Regenerated.
+
 2013-11-05  Yufeng Zhang  <yufeng.zhang@arm.com>
 
        * aarch64-opc.c (F_DEPRECATED): New macro.

diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c
index 0bf14d934c7669d9501460eec8d08cfbef5407b8..62cfbadf5737da652f86fc4bc04befaebc4377d1 100644 (file)
--- a/opcodes/i386-gen.c
+++ b/opcodes/i386-gen.c
@@ -81,7 +81,7 @@ static initializer cpu_flag_init[] =
   { "CPU_K6_FLAGS",
     "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|CpuSYSCALL|Cpu387|CpuMMX" },
   { "CPU_K6_2_FLAGS",
-    "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|CpuSYSCALL|Cpu387|CpuNop|CpuMMX|Cpu3dnow" },
+    "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|CpuSYSCALL|Cpu387|CpuMMX|Cpu3dnow" },
   { "CPU_ATHLON_FLAGS",
     "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuSYSCALL|Cpu387|Cpu687|CpuNop|CpuMMX|Cpu3dnow|Cpu3dnowA" },
   { "CPU_K8_FLAGS",

diff --git a/opcodes/i386-init.h b/opcodes/i386-init.h
index fa638a902db4f891cea1f404a2e3c264dc94e700..579bb1338b76c191f9111717f0a59a61980d336a 100644 (file)
--- a/opcodes/i386-init.h
+++ b/opcodes/i386-init.h
@@ -134,7 +134,7 @@
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_K6_2_FLAGS \
-  { { 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0,  \
+  { { 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }