1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 298bd22941..db5d483180 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-08-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86/cpu-features.c (init_cpu_features): Check
+	whether cpuid is available only if HAS_CPUID is 0.
+	* sysdeps/x86/cpu-features.h (HAS_CPUID): New.
+	(HAS_I586): Likewise.
+	(HAS_I686): Likewise.
+
 2015-08-18  Marko Myllynen  <myllynen@redhat.com>
 
 	[BZ #16973]