diff mbox

[i386] : Use vendor signatures from cpuid.h in cpuinfo.c

Message ID CAFULd4aA0Er_34vjD6jXDC72P3SQ7cUTyrjhbQ0i84F7kNerdA@mail.gmail.com
State New
Headers show

Commit Message

Uros Bizjak Dec. 26, 2013, 2:16 p.m. UTC
Hello!

Use the same definitions from common header.

2013-12-26  Uros Bizjak  <ubizjak@gmail.com>

    * config/i386/cpuinfo.c (enum vendor_signatures): Remove.
    (__cpu_indicator_init): Use signature_INTEL_ebx and signature_AMD_ebx
    from cpuid.h to check vendor signatures.

No functional changes.

Bootstrapped on x86_64-pc-linux-gnu and committed to mainline SVN.

Uros.
diff mbox

Patch

Index: config/i386/cpuinfo.c
===================================================================
--- config/i386/cpuinfo.c	(revision 206210)
+++ config/i386/cpuinfo.c	(working copy)
@@ -36,12 +36,6 @@  see the files COPYING3 and COPYING.RUNTIME respect
 int __cpu_indicator_init (void)
   __attribute__ ((constructor CONSTRUCTOR_PRIORITY));
 
-enum vendor_signatures
-{
-  SIG_INTEL =	0x756e6547 /* Genu */,
-  SIG_AMD =	0x68747541 /* Auth */
-};
-
 /* Processor Vendor and Models. */
 
 enum processor_vendor
@@ -368,7 +362,7 @@  __cpu_indicator_init (void)
   extended_model = (eax >> 12) & 0xf0;
   extended_family = (eax >> 20) & 0xff;
 
-  if (vendor == SIG_INTEL)
+  if (vendor == signature_INTEL_ebx)
     {
       /* Adjust model and family for Intel CPUS. */
       if (family == 0x0f)
@@ -385,7 +379,7 @@  __cpu_indicator_init (void)
       get_available_features (ecx, edx, max_level);
       __cpu_model.__cpu_vendor = VENDOR_INTEL;
     }
-  else if (vendor == SIG_AMD)
+  else if (vendor == signature_AMD_ebx)
     {
       /* Adjust model and family for AMD CPUS. */
       if (family == 0x0f)