diff --git a/gas/ChangeLog b/gas/ChangeLog
index c4c64afc0e9..845ec2e9e09 100644
--- 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): Continue if processor
+	doesn't match.
+
 2008-01-09  Alexandre Oliva  <aoliva@redhat.com>
 
 	* config/tc-ia64.c (ia64_convert_frag): Zero-initialize room for
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 7ac24423b99..4d2c7c509e7 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -3056,13 +3056,11 @@ match_template (void)
       else 
 	{
 	  found_cpu_match = cpu_flags_match (t->cpu_flags) == 3;
+	  if (!found_cpu_match)
+	    continue;
 	  if (!t->operands)
-	    {
-	      if (!found_cpu_match)
-		continue;
-	      /* We've found a match; break out of loop.  */
-	      break;
-	    }
+	    /* We've found a match; break out of loop.  */
+	    break;
 	}
 
       /* Address size prefix will turn Disp64/Disp32/Disp16 operand