about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/x86/cpu-features.h17
2 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b8181eb44..962794ad77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86/cpu-features.h (HAS_I586): Defined to 1 if
+	__i586__ is defined.
+	(HAS_I686): Defined to 1 if __i686__ is defined.
+
 2015-08-19  Joseph Myers  <joseph@codesourcery.com>
 
 	* elf/Makefile [$(have-z-execstack) = yes]
diff --git a/sysdeps/x86/cpu-features.h b/sysdeps/x86/cpu-features.h
index 6b8299f125..6e706241ad 100644
--- a/sysdeps/x86/cpu-features.h
+++ b/sysdeps/x86/cpu-features.h
@@ -239,17 +239,18 @@ extern const struct cpu_features *__get_cpu_features (void)
 
 #ifdef __x86_64__
 # define HAS_CPUID 1
-#elif defined __pentium__
+#elif defined __i586__ || defined __pentium__
 # define HAS_CPUID 1
 # define HAS_I586 1
 # define HAS_I686 0
-#elif (defined __pentiumpro__ || defined __pentium4__		\
-       || defined __nocona__ || defined __atom__		\
-       || defined __core2__ || defined __corei7__		\
-       || defined __corei7_avx__ || defined __core_avx2__	\
-       || defined __nehalem__ || defined __sandybridge__	\
-       || defined __haswell__  || defined __knl__		\
-       || defined __bonnell__ || defined __silvermont__ 	\
+#elif (defined __i686__ || defined __pentiumpro__		\
+       || defined __pentium4__ || defined __nocona__		\
+       || defined __atom__ || defined __core2__			\
+       || defined __corei7__ || defined __corei7_avx__		\
+       || defined __core_avx2__	|| defined __nehalem__		\
+       || defined __sandybridge__ || defined __haswell__	\
+       || defined __knl__ || defined __bonnell__		\
+       || defined __silvermont__				\
        || defined __k6__ || defined __k8__			\
        || defined __athlon__ || defined __amdfam10__		\
        || defined __bdver1__ || defined __bdver2__		\