cpuinfo.c (enum vendor_signatures): Remove.

* 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.

From-SVN: r206211
This commit is contained in:
Uros Bizjak 2013-12-26 15:12:20 +01:00 committed by Uros Bizjak
parent f4a4bdbb6c
commit 1879e97f6c
2 changed files with 8 additions and 8 deletions

View File

@ -1,3 +1,9 @@
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.
2013-12-26 Ganesh Gopalasubramanian <Ganesh.Gopalasubramanian@amd.com> 2013-12-26 Ganesh Gopalasubramanian <Ganesh.Gopalasubramanian@amd.com>
* config/i386/cpuinfo.c (processor_types): Rename AMD cpu names * config/i386/cpuinfo.c (processor_types): Rename AMD cpu names

View File

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