2008-01-10 H.J. Lu <hongjiu.lu@intel.com>

	* config/tc-i386.c (match_template): Check processor support
	first.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 845ec2e9e0917bdb2a51f9347194d144238910db..38ebf5940321b05102f8a36f051e06df6f7057de 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * config/tc-i386.c (match_template): Check processor support
+       first.
+
 2008-01-10  H.J. Lu  <hongjiu.lu@intel.com>
 
        * config/tc-i386.c (match_template): Continue if processor

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 4d2c7c509e79899e04029b14d49c1ca2d3137e92..1d884b666bd402bdf66ed9d44491826c42967026 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -3000,6 +3000,11 @@ match_template (void)
       if (i.operands != t->operands)
        continue;
 
+      /* Check processor support.  */
+      found_cpu_match = cpu_flags_match (t->cpu_flags) == 3;
+      if (!found_cpu_match)
+       continue;
+
       /* Check old gcc support. */
       if (!old_gcc && t->opcode_modifier.oldgcc)
        continue;
@@ -3053,11 +3058,8 @@ match_template (void)
        continue;
 
       /* Do not verify operands when there are none.  */
-      else 
+      else
        {
-         found_cpu_match = cpu_flags_match (t->cpu_flags) == 3;
-         if (!found_cpu_match)
-           continue;
          if (!t->operands)
            /* We've found a match; break out of loop.  */
            break;