2006-03-20 Paul Brook <paul@codesourcery.com>

	* gas/config/tc-arm.c (parse_tb): Set inst.error before returning FAIL.

diff --git a/ChangeLog.csl b/ChangeLog.csl
index 11e352f..255c0c5 100644 (file)
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,5 +1,9 @@
 2006-03-20  Paul Brook  <paul@codesourcery.com>
 
+       * gas/config/tc-arm.c (parse_tb): Set inst.error before returning FAIL.
+
+2006-03-20  Paul Brook  <paul@codesourcery.com>
+
        * gas/config/tc-arm.c (md_apply_fix): Set H bit on blx instruction.
 
        * gas/testsuite/gas/arm/blx-local.d: New test.

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 4305b0b..afe6522 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -3706,7 +3706,10 @@ parse_tb (char **str)
   int reg;
 
   if (skip_past_char (&p, '[') == FAIL)
-    return FAIL;
+    {
+      inst.error = _("'[' expected");
+      return FAIL;
+    }
 
   if ((reg = arm_reg_parse (&p, REG_TYPE_RN)) == FAIL)
     {
@@ -3716,7 +3719,10 @@ parse_tb (char **str)
   inst.operands[0].reg = reg;
 
   if (skip_past_comma (&p) == FAIL)
-    return FAIL;
+    {
+      inst.error = _("',' expected");
+      return FAIL;
+    }
   
   if ((reg = arm_reg_parse (&p, REG_TYPE_RN)) == FAIL)
     {