[gcc(refs/vendors/ARM/heads/arm-perf-staging)] libgcc: Move FEATURE_AVX512VP2INTERSECT after FEATURE_AVX512BF16

[Tamar Christina]

https://gcc.gnu.org/g:9b7d71fdedcc360ad4fe8322ecb522cb7bf8a0f7

commit 9b7d71fdedcc360ad4fe8322ecb522cb7bf8a0f7
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Thu May 21 05:32:53 2020 -0700

    libgcc: Move FEATURE_AVX512VP2INTERSECT after FEATURE_AVX512BF16
    
    Move FEATURE_AVX512VP2INTERSECT after FEATURE_AVX512BF16 to avoid
    changing libgcc ABI.
    
    gcc/
    
            PR target/95212
            * config/i386/i386-builtins.c (processor_features): Move
            F_AVX512VP2INTERSECT after F_AVX512BF16.
            (isa_names_table): Likewise.
    
    libgcc/
    
            PR target/95212
            * config/i386/cpuinfo.h (processor_features): Move
            FEATURE_AVX512VP2INTERSECT after FEATURE_AVX512BF16.
    
    (cherry picked from commit 5855bdfa06fb25c0880af89cb2bfdcdf342beac2)

Diff:
---
 gcc/ChangeLog                   | 10 ++++++++++
 gcc/config/i386/i386-builtins.c |  6 +++---
 libgcc/ChangeLog                |  9 +++++++++
 libgcc/config/i386/cpuinfo.h    |  4 ++--
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 34eb0e87321..9ceff21c0cb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2020-05-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	Backport from master
+	2020-05-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/95212
+	* config/i386/i386-builtins.c (processor_features): Move
+	F_AVX512VP2INTERSECT after F_AVX512BF16.
+	(isa_names_table): Likewise.
+
 2020-05-19  Gerald Pfeifer  <gerald@pfeifer.com>
 
 	Backport from mainline
diff --git a/gcc/config/i386/i386-builtins.c b/gcc/config/i386/i386-builtins.c
index 4b203635428..be3ed0158f2 100644
--- a/gcc/config/i386/i386-builtins.c
+++ b/gcc/config/i386/i386-builtins.c
@@ -1911,8 +1911,8 @@ enum processor_features
   F_VPCLMULQDQ,
   F_AVX512VNNI,
   F_AVX512BITALG,
-  F_AVX512VP2INTERSECT,
   F_AVX512BF16,
+  F_AVX512VP2INTERSECT,
   F_MAX
 };
 
@@ -2062,8 +2062,8 @@ static const _isa_names_table isa_names_table[] =
   {"vpclmulqdq", F_VPCLMULQDQ, P_ZERO},
   {"avx512vnni", F_AVX512VNNI, P_ZERO},
   {"avx512bitalg", F_AVX512BITALG, P_ZERO},
-  {"avx512vp2intersect",F_AVX512VP2INTERSECT, P_ZERO},
-  {"avx512bf16", F_AVX512BF16, P_ZERO}
+  {"avx512bf16", F_AVX512BF16, P_ZERO},
+  {"avx512vp2intersect",F_AVX512VP2INTERSECT, P_ZERO}
 };
 
 /* This parses the attribute arguments to target in DECL and determines
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 90955415ee4..d80178f6f78 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,12 @@
+2020-05-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	Backport from master
+	2020-05-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/95212
+	* config/i386/cpuinfo.h (processor_features): Move
+	FEATURE_AVX512VP2INTERSECT after FEATURE_AVX512BF16.
+
 2020-05-20  H.J. Lu  <hongjiu.lu@intel.com>
 
 	Backport from master
diff --git a/libgcc/config/i386/cpuinfo.h b/libgcc/config/i386/cpuinfo.h
index fd6d12a7d68..0f97510cde1 100644
--- a/libgcc/config/i386/cpuinfo.h
+++ b/libgcc/config/i386/cpuinfo.h
@@ -122,8 +122,8 @@ enum processor_features
   FEATURE_VPCLMULQDQ,
   FEATURE_AVX512VNNI,
   FEATURE_AVX512BITALG,
-  FEATURE_AVX512VP2INTERSECT,
-  FEATURE_AVX512BF16
+  FEATURE_AVX512BF16,
+  FEATURE_AVX512VP2INTERSECT
 };
 
 extern struct __processor_model