[PATCH 1/6] x86: avoid cpu_flags_match() bogusly setting CPU_FLAGS_ARCH_MATCH

[Jan Beulich]

gas/
2018-03-07  Jan Beulich  <jbeulich@suse.com>

	* config/tc-i386.c (cpu_flags_match): Drop "else" branches
	setting CPU_FLAGS_ARCH_MATCH.

--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -1738,8 +1738,6 @@ cpu_flags_match (const insn_template *t)
 			match |= CPU_FLAGS_PCLMUL_MATCH;
 		    }
 		}
-	      else
-		match |= CPU_FLAGS_ARCH_MATCH;
 	    }
 	  else if (x.bitfield.cpuavx512vl)
 	    {
@@ -1750,11 +1748,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;