summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--opcodes/ChangeLog6
-rw-r--r--opcodes/i386-gen.c2
-rw-r--r--opcodes/i386-init.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index ca23e3218c..2584a555a0 100644
--- 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 115b273925..d2c9393a4c 100644
--- 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 32f84651be..5ff4321288 100644
--- 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 } }
OpenPOWER on IntegriCloud