From: Jan Beulich <jbeulich@novell.com>
Date: Thu, 8 Mar 2018 07:44:12 +0000 (+0100)
Subject: x86: avoid cpu_flags_match() bogusly setting CPU_FLAGS_ARCH_MATCH
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bcb1753ee643a7d5ac136189f9bc06717dfdfb64;p=binutils-gdb.git

x86: avoid cpu_flags_match() bogusly setting CPU_FLAGS_ARCH_MATCH
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 78fafb66155..683d1bce9a4 100644
--- 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 4cf7b9daf53..0c0b591cbfe 100644
--- 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;