aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2006-04-07 15:11:19 +0000
committerPaul Brook <paul@codesourcery.com>2006-04-07 15:11:19 +0000
commitd252fddeb11e862008a49c9427a907f75c06f02b (patch)
tree8a6816c19637260e101c0f1917e1836931dfd2cc /gas
parentab1eb5fea7e04d3aac9e3522f87d580dc14244cf (diff)
downloadfsf-binutils-gdb-d252fddeb11e862008a49c9427a907f75c06f02b.zip
fsf-binutils-gdb-d252fddeb11e862008a49c9427a907f75c06f02b.tar.gz
fsf-binutils-gdb-d252fddeb11e862008a49c9427a907f75c06f02b.tar.bz2
2006-04-07 Paul Brook <paul@codesourcery.com>
* config/tc-arm.c (parse_operands): Set default error message.
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog4
-rw-r--r--gas/config/tc-arm.c14
2 files changed, 16 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index a63e8be..f6a33a5 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,9 @@
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.
2006-04-07 Paul Brook <paul@codesourcery.com>
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index a37e0f6..5af2cd4 100644
--- 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;