2006-04-07 Paul Brook <paul@codesourcery.com>

	* config/tc-arm.c (parse_operands): Set default error message.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index a63e8be3ad44c899f75ae3ea7d764e015b209032..f6a33a5ef2e7a7941a7e86d2c29cfc985f652648 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-07  Paul Brook  <paul@codesourcery.com>
+
+       * config/tc-arm.c (parse_operands): Set default error message.
+
 2006-04-07  Paul Brook  <paul@codesourcery.com>
 
        * config/tc-arm.c (parse_tb): Set inst.error before returning FAIL.

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index a37e0f69e1d1711b8bc55eccb1c057b0892fdba8..5af2cd4efbd0a080a1287b31c378c2cfa78c8900 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -4139,7 +4139,13 @@ parse_operands (char *str, const unsigned char *pattern)
 
     failure:
       if (!backtrack_pos)
-       return FAIL;
+       {
+         /* The parse routine should already have set inst.error, but set a
+            defaut here just in case.  */
+         if (!inst.error)
+           inst.error = _("syntax error");
+         return FAIL;
+       }
 
       /* Do not backtrack over a trailing optional argument that
         absorbed some text.  We will only fail again, with the
@@ -4147,7 +4153,11 @@ parse_operands (char *str, const unsigned char *pattern)
         probably less helpful than the current one.  */
       if (backtrack_index == i && backtrack_pos != str
          && upat[i+1] == OP_stop)
-       return FAIL;
+       {
+         if (!inst.error)
+           inst.error = _("syntax error");
+         return FAIL;
+       }
 
       /* Try again, skipping the optional argument at backtrack_pos.  */
       str = backtrack_pos;