Add official name for AMD's "sledgehammer" CPU: "Opteron".

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

diff --git a/modules/arch/x86/x86id.re b/modules/arch/x86/x86id.re
index 12a9cfd30fed54afd6088fb74c4967b0ef9a7c55..f1ca62a92bc8a09ec611e08d9cfc2cd0d1621368 100644 (file)
--- a/modules/arch/x86/x86id.re
+++ b/modules/arch/x86/x86id.re
@@ -1927,7 +1927,7 @@ x86_switch_cpu(const char *id, unsigned long lindex)
                          CPU_SMM|CPU_Prot|CPU_Priv;
            return;
        }
-       (S L E D G E)? (H A M M E R) {
+       ((S L E D G E)? (H A M M E R)) | (O P T E R O N) {
            cpu_enabled = CPU_186|CPU_286|CPU_386|CPU_486|CPU_586|CPU_686|
                          CPU_K6|CPU_Athlon|CPU_Hammer|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 12a9cfd30fed54afd6088fb74c4967b0ef9a7c55..f1ca62a92bc8a09ec611e08d9cfc2cd0d1621368 100644 (file)
--- a/src/arch/x86/x86id.re
+++ b/src/arch/x86/x86id.re
@@ -1927,7 +1927,7 @@ x86_switch_cpu(const char *id, unsigned long lindex)
                          CPU_SMM|CPU_Prot|CPU_Priv;
            return;
        }
-       (S L E D G E)? (H A M M E R) {
+       ((S L E D G E)? (H A M M E R)) | (O P T E R O N) {
            cpu_enabled = CPU_186|CPU_286|CPU_386|CPU_486|CPU_586|CPU_686|
                          CPU_K6|CPU_Athlon|CPU_Hammer|CPU_FPU|CPU_MMX|CPU_SSE|
                          CPU_3DNow|CPU_SMM|CPU_Prot|CPU_Priv;