Merge [2088] from trunk (Add westmere CPU).
svn path=/branches/yasm-0.7.x/; revision=2092
diff --git a/modules/arch/x86/x86cpu.gperf b/modules/arch/x86/x86cpu.gperf
index 83e29b5..526e156 100644
--- a/modules/arch/x86/x86cpu.gperf
+++ b/modules/arch/x86/x86cpu.gperf
@@ -47,7 +47,8 @@
#define PROC_conroe 11
#define PROC_penryn 12
#define PROC_nehalem 13
-#define PROC_sandybridge 14
+#define PROC_westmere 14
+#define PROC_sandybridge 15
static void
x86_cpu_intel(wordptr cpu, unsigned int data)
@@ -59,9 +60,9 @@
BitVector_Bit_On(cpu, CPU_Prot);
if (data >= PROC_386)
BitVector_Bit_On(cpu, CPU_SMM);
- if (data >= PROC_sandybridge) {
+ if (data >= PROC_sandybridge)
BitVector_Bit_On(cpu, CPU_AVX);
- BitVector_Bit_On(cpu, CPU_FMA);
+ if (data >= PROC_westmere) {
BitVector_Bit_On(cpu, CPU_AES);
BitVector_Bit_On(cpu, CPU_CLMUL);
}
@@ -273,6 +274,7 @@
core2, x86_cpu_intel, PROC_conroe
penryn, x86_cpu_intel, PROC_penryn
nehalem, x86_cpu_intel, PROC_nehalem
+westmere, x86_cpu_intel, PROC_westmere
sandybridge, x86_cpu_intel, PROC_sandybridge
#
# Features have "no" versions to disable them, and only set/reset the
