[3/6] x86: drop CPU_FLAGS_32BIT_MATCH

Message ID 5A9FF10202000078001AF5E0@prv-mh.provo.novell.com
State New
Headers show
Series
  • x86: fix/improve cpu_flags_match()
Related show

Commit Message

Jan Beulich March 7, 2018, 1:02 p.m.
It has become a plain alias of CPU_FLAGS_ARCH_MATCH now.

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

	* config/tc-i386.c (CPU_FLAGS_32BIT_MATCH): Delete.
	(cpu_flags_match): Use CPU_FLAGS_ARCH_MATCH instead of
	CPU_FLAGS_32BIT_MATCH.

Comments

H.J. Lu March 7, 2018, 1:39 p.m. | #1
On Wed, Mar 7, 2018 at 5:02 AM, Jan Beulich <JBeulich@suse.com> wrote:
> It has become a plain alias of CPU_FLAGS_ARCH_MATCH now.

>

> gas/

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

>

>         * config/tc-i386.c (CPU_FLAGS_32BIT_MATCH): Delete.

>         (cpu_flags_match): Use CPU_FLAGS_ARCH_MATCH instead of

>         CPU_FLAGS_32BIT_MATCH.

>


OK.

Thanks.

-- 
H.J.

Patch

--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -1686,9 +1686,8 @@  cpu_flags_and_not (i386_cpu_flags x, i38
 #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. */
 
@@ -1704,7 +1703,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
     {
@@ -1731,11 +1730,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;