x86: avoid cpu_flags_match() bogusly setting CPU_FLAGS_ARCH_MATCH

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 78fafb6615514d7934efcdb363c22e4278127287..683d1bce9a456d5b9ac2ea4fdefd8ba344d48fe1 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-08  Jan Beulich  <jbeulich@suse.com>
+
+       * config/tc-i386.c (cpu_flags_match): Drop "else" branches
+       setting CPU_FLAGS_ARCH_MATCH.
+
 2018-03-08  Jan Beulich  <jbeulich@suse.com>
 
        * config/tc-i386.c (md_assemble): Extend SSE check conditional.

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 4cf7b9daf5355b571342caee0517b0ed92e3d3cb..0c0b591cbfe24cc0f0a60e83d0e8d3c5d71adb96 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -1740,8 +1740,6 @@ cpu_flags_match (const insn_template *t)
                        match |= CPU_FLAGS_PCLMUL_MATCH;
                    }
                }
-             else
-               match |= CPU_FLAGS_ARCH_MATCH;
            }
          else if (x.bitfield.cpuavx512vl)
            {
@@ -1752,11 +1750,7 @@ cpu_flags_match (const insn_template *t)
                  cpu.bitfield.cpuavx512vl = 0;
                  if (!cpu_flags_all_zero (&cpu))
                    match |= CPU_FLAGS_32BIT_MATCH;
-                 else
-                   match |= CPU_FLAGS_ARCH_MATCH;
                }
-             else
-               match |= CPU_FLAGS_ARCH_MATCH;
            }
          else
            match |= CPU_FLAGS_32BIT_MATCH;