From db12e14ea0f35738dbde263a8d37610995227853 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Thu, 8 Mar 2018 08:45:25 +0100 Subject: [PATCH] x86: drop CPU_FLAGS_32BIT_MATCH It has become a plain alias of CPU_FLAGS_ARCH_MATCH now. --- gas/ChangeLog | 6 ++++++ gas/config/tc-i386.c | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 60460115c1e..144edef8f7e 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2018-03-08 Jan Beulich + + * config/tc-i386.c (CPU_FLAGS_32BIT_MATCH): Delete. + (cpu_flags_match): Use CPU_FLAGS_ARCH_MATCH instead of + CPU_FLAGS_32BIT_MATCH. + 2018-03-08 Jan Beulich * config/tc-i386.c (CPU_FLAGS_AES_MATCH, CPU_FLAGS_AVX_MATCH, diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index 818281cd6ec..dee36446f27 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -1688,9 +1688,8 @@ cpu_flags_and_not (i386_cpu_flags x, i386_cpu_flags y) #define CPU_FLAGS_ARCH_MATCH 0x1 #define CPU_FLAGS_64BIT_MATCH 0x2 -#define CPU_FLAGS_32BIT_MATCH CPU_FLAGS_ARCH_MATCH #define CPU_FLAGS_PERFECT_MATCH \ - (CPU_FLAGS_32BIT_MATCH | CPU_FLAGS_64BIT_MATCH) + (CPU_FLAGS_ARCH_MATCH | CPU_FLAGS_64BIT_MATCH) /* Return CPU flags match bits. */ @@ -1706,7 +1705,7 @@ cpu_flags_match (const insn_template *t) if (cpu_flags_all_zero (&x)) { /* This instruction is available on all archs. */ - match |= CPU_FLAGS_32BIT_MATCH; + match |= CPU_FLAGS_ARCH_MATCH; } else { @@ -1733,11 +1732,11 @@ cpu_flags_match (const insn_template *t) /* Need another match. */ cpu.bitfield.cpuavx512vl = 0; if (!cpu_flags_all_zero (&cpu)) - match |= CPU_FLAGS_32BIT_MATCH; + match |= CPU_FLAGS_ARCH_MATCH; } } else - match |= CPU_FLAGS_32BIT_MATCH; + match |= CPU_FLAGS_ARCH_MATCH; } } return match; -- 2.30.2