x86: Update GFNI check

Update GFNI check to support processors with SSE and AVX versions of GFNI.

	Backport from master
	PR target/95220
	* config/i386/cpuinfo.c (get_available_features): Fix
	FEATURE_GFNI check.

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 5554dca9c6050c2dd054147cc476848f8d2a39a1..93c100a338d58a15959f4a0cfe37860f4db2fde0 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,12 @@
+2020-05-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+       Backport from master
+       2020-05-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR target/95220
+       * config/i386/cpuinfo.c (get_available_features): Fix
+       FEATURE_GFNI check.
+
 2020-05-14  Szabolcs Nagy  <szabolcs.nagy@arm.com>
 
        Backport from mainline.

diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
index d6cb2de62654a88785282f72168d02d8f58343bb..7e47c39f74bad4b63501bbadfc3469d627aafd5e 100644 (file)
--- a/libgcc/config/i386/cpuinfo.c
+++ b/libgcc/config/i386/cpuinfo.c
@@ -349,6 +349,8 @@ get_available_features (unsigned int ecx, unsigned int edx,
        }
       if (ebx & bit_BMI2)
        set_feature (FEATURE_BMI2);
+      if (ecx & bit_GFNI)
+       set_feature (FEATURE_GFNI);
       if (avx512_usable)
        {
          if (ebx & bit_AVX512F)
@@ -371,8 +373,6 @@ get_available_features (unsigned int ecx, unsigned int edx,
            set_feature (FEATURE_AVX512VBMI);
          if (ecx & bit_AVX512VBMI2)
            set_feature (FEATURE_AVX512VBMI2);
-         if (ecx & bit_GFNI)
-           set_feature (FEATURE_GFNI);
          if (ecx & bit_VPCLMULQDQ)
            set_feature (FEATURE_VPCLMULQDQ);
          if (ecx & bit_AVX512VNNI)