x86: avoid cpu_flags_match() bogusly setting CPU_FLAGS_ARCH_MATCH

This commit is contained in:
Jan Beulich 2018-03-08 08:44:12 +01:00 committed by Jan Beulich
parent 1b193f0b12
commit bcb1753ee6
2 changed files with 5 additions and 6 deletions

View File

@ -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> 2018-03-08 Jan Beulich <jbeulich@suse.com>
* config/tc-i386.c (md_assemble): Extend SSE check conditional. * config/tc-i386.c (md_assemble): Extend SSE check conditional.

View File

@ -1740,8 +1740,6 @@ cpu_flags_match (const insn_template *t)
match |= CPU_FLAGS_PCLMUL_MATCH; match |= CPU_FLAGS_PCLMUL_MATCH;
} }
} }
else
match |= CPU_FLAGS_ARCH_MATCH;
} }
else if (x.bitfield.cpuavx512vl) else if (x.bitfield.cpuavx512vl)
{ {
@ -1752,11 +1750,7 @@ cpu_flags_match (const insn_template *t)
cpu.bitfield.cpuavx512vl = 0; cpu.bitfield.cpuavx512vl = 0;
if (!cpu_flags_all_zero (&cpu)) if (!cpu_flags_all_zero (&cpu))
match |= CPU_FLAGS_32BIT_MATCH; match |= CPU_FLAGS_32BIT_MATCH;
else
match |= CPU_FLAGS_ARCH_MATCH;
} }
else
match |= CPU_FLAGS_ARCH_MATCH;
} }
else else
match |= CPU_FLAGS_32BIT_MATCH; match |= CPU_FLAGS_32BIT_MATCH;