aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog6
-rw-r--r--gas/config/tc-arm.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index eeeff51..2028383 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-02 Nick Clifton <nickc@redhat.com>
+
+ PR 18119
+ * config/tc-arm.c (do_mrs): Fix test of bits 16-19 in non-banked
+ version of ARM MRS instruction.
+
2017-12-28 Jim Wilson <jimw@sifive.com>
* testsuite/gas/riscv/priv-reg.d, testsuite/gas/riscv/priv-reg.s: New.
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index c12a453..c304793 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -9243,7 +9243,7 @@ do_mrs (void)
if (inst.operands[1].isreg)
{
br = inst.operands[1].reg;
- if (((br & 0x200) == 0) && ((br & 0xf0000) != 0xf000))
+ if (((br & 0x200) == 0) && ((br & 0xf0000) != 0xf0000))
as_bad (_("bad register for mrs"));
}
else