x86: drop CPU_FLAGS_32BIT_MATCH

It has become a plain alias of CPU_FLAGS_ARCH_MATCH now.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 60460115c1e658ca18aafe263d1c42d35186888f..144edef8f7ee9d11f90417d123c50d1a14ba2e32 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-08  Jan Beulich  <jbeulich@suse.com>
+
+       * config/tc-i386.c (CPU_FLAGS_32BIT_MATCH): Delete.
+       (cpu_flags_match): Use CPU_FLAGS_ARCH_MATCH instead of
+       CPU_FLAGS_32BIT_MATCH.
+
 2018-03-08  Jan Beulich  <jbeulich@suse.com>
 
        * config/tc-i386.c (CPU_FLAGS_AES_MATCH, CPU_FLAGS_AVX_MATCH,

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 818281cd6ec46c2ec9046292d9399590158233d0..dee36446f274855583b953d2712d5e54cbe06fb3 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -1688,9 +1688,8 @@ cpu_flags_and_not (i386_cpu_flags x, i386_cpu_flags y)
 #define CPU_FLAGS_ARCH_MATCH           0x1
 #define CPU_FLAGS_64BIT_MATCH          0x2
 
-#define CPU_FLAGS_32BIT_MATCH CPU_FLAGS_ARCH_MATCH
 #define CPU_FLAGS_PERFECT_MATCH \
-  (CPU_FLAGS_32BIT_MATCH | CPU_FLAGS_64BIT_MATCH)
+  (CPU_FLAGS_ARCH_MATCH | CPU_FLAGS_64BIT_MATCH)
 
 /* Return CPU flags match bits. */
 
@@ -1706,7 +1705,7 @@ cpu_flags_match (const insn_template *t)
   if (cpu_flags_all_zero (&x))
     {
       /* This instruction is available on all archs.  */
-      match |= CPU_FLAGS_32BIT_MATCH;
+      match |= CPU_FLAGS_ARCH_MATCH;
     }
   else
     {
@@ -1733,11 +1732,11 @@ cpu_flags_match (const insn_template *t)
                  /* Need another match.  */
                  cpu.bitfield.cpuavx512vl = 0;
                  if (!cpu_flags_all_zero (&cpu))
-                   match |= CPU_FLAGS_32BIT_MATCH;
+                   match |= CPU_FLAGS_ARCH_MATCH;
                }
            }
          else
-           match |= CPU_FLAGS_32BIT_MATCH;
+           match |= CPU_FLAGS_ARCH_MATCH;
        }
     }
   return match;