From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 17 Mar 2017 18:38:13 +0000 (-0700)
Subject: Use CPU_FEATURES_CPU_P to check if AVX is available
X-Git-Tag: glibc-2.26~691
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b170d2e7ab998180abbd24fdd6c03ecb4293d000;p=thirdparty%2Fglibc.git

Use CPU_FEATURES_CPU_P to check if AVX is available

Don't use bit_cpu_AVX directly.

	* sysdeps/x86/cpu-features.c (init_cpu_features): Check AVX with
	CPU_FEATURES_CPU_P.
---

diff --git a/ChangeLog b/ChangeLog
index 9fd5ebc564a..4bafcd183c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86/cpu-features.c (init_cpu_features): Check AVX with
+	CPU_FEATURES_CPU_P.
+
 2017-03-17  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #21259]
diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
index 4e8f1790003..33788ed3237 100644
--- a/sysdeps/x86/cpu-features.c
+++ b/sysdeps/x86/cpu-features.c
@@ -126,7 +126,6 @@ init_cpu_features (struct cpu_features *cpu_features)
 
       if (family == 0x06)
 	{
-	  ecx = cpu_features->cpuid[COMMON_CPUID_INDEX_1].ecx;
 	  model += extended_model;
 	  switch (model)
 	    {
@@ -176,7 +175,7 @@ init_cpu_features (struct cpu_features *cpu_features)
 	    default:
 	      /* Unknown family 0x06 processors.  Assuming this is one
 		 of Core i3/i5/i7 processors if AVX is available.  */
-	      if ((ecx & bit_cpu_AVX) == 0)
+	      if (!CPU_FEATURES_CPU_P (cpu_features, AVX))
 		break;
 
 	    case 0x1a: