From: Peter Johnson <peter@tortall.net>
Date: Sat, 9 Nov 2002 10:40:10 +0000 (-0000)
Subject: The AMD Athlon is also known as the K7.
X-Git-Tag: v0.2.0~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62e4ea64da0b9832d760b1528baa5d306ddec69d;p=yasm

The AMD Athlon is also known as the K7.

svn path=/trunk/yasm/; revision=808
---

diff --git a/modules/arch/x86/x86id.re b/modules/arch/x86/x86id.re
index f1ca62a9..321dab83 100644
--- a/modules/arch/x86/x86id.re
+++ b/modules/arch/x86/x86id.re
@@ -1921,7 +1921,7 @@ x86_switch_cpu(const char *id, unsigned long lindex)
 			  CPU_Priv;
 	    return;
 	}
-	A T H L O N {
+	(A T H L O N) | (K "7") {
 	    cpu_enabled = CPU_186|CPU_286|CPU_386|CPU_486|CPU_586|CPU_686|
 			  CPU_K6|CPU_Athlon|CPU_FPU|CPU_MMX|CPU_SSE|CPU_3DNow|
 			  CPU_SMM|CPU_Prot|CPU_Priv;
diff --git a/src/arch/x86/x86id.re b/src/arch/x86/x86id.re
index f1ca62a9..321dab83 100644
--- a/src/arch/x86/x86id.re
+++ b/src/arch/x86/x86id.re
@@ -1921,7 +1921,7 @@ x86_switch_cpu(const char *id, unsigned long lindex)
 			  CPU_Priv;
 	    return;
 	}
-	A T H L O N {
+	(A T H L O N) | (K "7") {
 	    cpu_enabled = CPU_186|CPU_286|CPU_386|CPU_486|CPU_586|CPU_686|
 			  CPU_K6|CPU_Athlon|CPU_FPU|CPU_MMX|CPU_SSE|CPU_3DNow|
 			  CPU_SMM|CPU_Prot|CPU_Priv;