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 f1ca62a92bc8a09ec611e08d9cfc2cd0d1621368..321dab83d301da667b2cb087d8e59d6a2ab77b2c 100644 (file)
--- 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 f1ca62a92bc8a09ec611e08d9cfc2cd0d1621368..321dab83d301da667b2cb087d8e59d6a2ab77b2c 100644 (file)
--- 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;