aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog6
-rw-r--r--gas/config/tc-mips.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index afbb20e..0952daf 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,11 @@
2017-05-15 Maciej W. Rozycki <macro@imgtec.com>
+ * config/tc-mips.c (match_int_operand): Call
+ `match_not_constant' before returning failure for a non-constant
+ 16-bit immediate conditionally allowed.
+
+2017-05-15 Maciej W. Rozycki <macro@imgtec.com>
+
* config/tc-mips.c (match_const_int): Call `match_out_of_range'
rather than `match_not_constant' for unrelocated operands
retrieved as an `O_big' expression.
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 9fde462..3dc6a53 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -5082,7 +5082,10 @@ match_int_operand (struct mips_arg_info *arg,
/* Accept non-constant operands if no later alternative matches,
leaving it for the caller to process. */
if (!arg->lax_match)
- return FALSE;
+ {
+ match_not_constant (arg);
+ return FALSE;
+ }
offset_reloc[0] = BFD_RELOC_LO16;
return TRUE;
}