Correct CPU definitions for Prescott, Conroe, Penryn, and Nehalem.

All are 64-bit capable and thus should set CPU_Hammer; Prescott
was mistakingly also setting AMD features such as 3DNow.

svn path=/trunk/yasm/; revision=1870

diff --git a/modules/arch/x86/x86parse.gap b/modules/arch/x86/x86parse.gap
index b94006ddd7841669cc2aebe90096ffe371b2c3f3..c9d714111c677fc05eefb4052922bc0b22b4e7b4 100644 (file)
--- a/modules/arch/x86/x86parse.gap
+++ b/modules/arch/x86/x86parse.gap
@@ -984,19 +984,19 @@ CPU_ALIAS opteron         hammer
 CPU_ALIAS      athlon64        hammer
 CPU_ALIAS      athlon-64       hammer
 CPU            prescott CPU_186|CPU_286|CPU_386|CPU_486|CPU_586|CPU_686|\
-                       CPU_K6|CPU_Athlon|CPU_Hammer|CPU_EM64T|CPU_FPU|CPU_MMX|\
-                       CPU_SSE|CPU_SSE2|CPU_SSE3|CPU_3DNow|CPU_SMM|\
+                       CPU_Hammer|CPU_EM64T|CPU_FPU|CPU_MMX|\
+                       CPU_SSE|CPU_SSE2|CPU_SSE3|CPU_SMM|\
                        CPU_Prot|CPU_Priv
 CPU            conroe  CPU_186|CPU_286|CPU_386|CPU_486|CPU_586|CPU_686|\
-                       CPU_EM64T|CPU_FPU|CPU_MMX|\
+                       CPU_Hammer|CPU_EM64T|CPU_FPU|CPU_MMX|\
                        CPU_SSE|CPU_SSE2|CPU_SSE3|CPU_SSSE3|CPU_SMM|\
                        CPU_Prot|CPU_Priv
 CPU            penryn  CPU_186|CPU_286|CPU_386|CPU_486|CPU_586|CPU_686|\
-                       CPU_EM64T|CPU_FPU|CPU_MMX|\
+                       CPU_Hammer|CPU_EM64T|CPU_FPU|CPU_MMX|\
                        CPU_SSE|CPU_SSE2|CPU_SSE3|CPU_SSSE3|CPU_SSE41|CPU_SMM|\
                        CPU_Prot|CPU_Priv
 CPU            nehalem CPU_186|CPU_286|CPU_386|CPU_486|CPU_586|CPU_686|\
-                       CPU_EM64T|CPU_FPU|CPU_MMX|\
+                       CPU_Hammer|CPU_EM64T|CPU_FPU|CPU_MMX|\
                        CPU_SSE|CPU_SSE2|CPU_SSE3|CPU_SSSE3|CPU_SSE41|\
                        CPU_SSE42|CPU_SMM|CPU_Prot|CPU_Priv