From a0f1278f2dc2c3d0ee856f80d8735f7b153dc0f2 Mon Sep 17 00:00:00 2001 From: uros Date: Thu, 26 Dec 2013 14:12:20 +0000 Subject: [PATCH] * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206211 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgcc/ChangeLog | 6 ++++++ libgcc/config/i386/cpuinfo.c | 10 ++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index c4dd997c28c..1488dec5f90 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,9 @@ +2013-12-26 Uros Bizjak + + * 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 * config/i386/cpuinfo.c (processor_types): Rename AMD cpu names diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c index 7835b202906..394db876d72 100644 --- a/libgcc/config/i386/cpuinfo.c +++ b/libgcc/config/i386/cpuinfo.c @@ -36,12 +36,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see 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) -- 2.11.4.GIT