diff --git a/gas/ChangeLog b/gas/ChangeLog
index eb9b7422a4f..13794000c41 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (parse_insn): Use default_arch on unsupported
+	arch.
+
 2009-03-23  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR gas/9966
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 1f8cc1024a1..91836ea9096 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -3145,7 +3145,8 @@ check_suffix:
   if (supported != CPU_FLAGS_PERFECT_MATCH)
     {
       as_bad (_("`%s' is not supported on `%s%s'"),
-	      current_templates->start->name, cpu_arch_name,
+	      current_templates->start->name, 
+	      cpu_arch_name ? cpu_arch_name : default_arch,
 	      cpu_sub_arch_name ? cpu_sub_arch_name : "");
       return NULL;
     }