This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[committed, PATCH] Check if cpuid is available in init_cpu_features
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Thu, 13 Aug 2015 04:54:12 -0700
- Subject: [committed, PATCH] Check if cpuid is available in init_cpu_features
- Authentication-results: sourceware.org; auth=none
Since not all i486 processors support cpuid, we call __get_cpuid_max to
check if cpuid is available before using it if not compiling for i586,
i686 nor x86-64.
* sysdeps/x86/cpu-features.c (init_cpu_features): Call
__get_cpuid_max if not compiling for i586, i686 nor x86-64.
---
sysdeps/x86/cpu-features.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
index 587080c..582a8f5 100644
--- a/sysdeps/x86/cpu-features.c
+++ b/sysdeps/x86/cpu-features.c
@@ -40,6 +40,14 @@ init_cpu_features (struct cpu_features *cpu_features)
unsigned int model = 0;
enum cpu_features_kind kind;
+#if !defined __i586__ && !defined __i686__ && !defined __x86_64__
+ if (__get_cpuid_max (0, 0) == 0)
+ {
+ kind = arch_kind_other;
+ goto no_cpuid;
+ }
+#endif
+
__cpuid (0, cpu_features->max_cpuid, ebx, ecx, edx);
/* This spells out "GenuineIntel". */
@@ -196,6 +204,10 @@ init_cpu_features (struct cpu_features *cpu_features)
}
}
+#if !defined __i586__ && !defined __i686__ && !defined __x86_64__
+no_cpuid:
+#endif
+
cpu_features->family = family;
cpu_features->model = model;
cpu_features->kind = kind;
--
2.4.3