From bcb1753ee643a7d5ac136189f9bc06717dfdfb64 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Thu, 8 Mar 2018 08:44:12 +0100 Subject: [PATCH] x86: avoid cpu_flags_match() bogusly setting CPU_FLAGS_ARCH_MATCH --- gas/ChangeLog | 5 +++++ gas/config/tc-i386.c | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) 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 + + * config/tc-i386.c (cpu_flags_match): Drop "else" branches + setting CPU_FLAGS_ARCH_MATCH. + 2018-03-08 Jan Beulich * 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; -- 2.30.2