summaryrefslogtreecommitdiff
path: root/gas/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'gas/ChangeLog')
-rw-r--r--gas/ChangeLog12
1 files changed, 12 insertions, 0 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index c266eb46641..30bc4fd3c7c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,15 @@
+2018-03-29 Nick Clifton <nickc@redhat.com>
+
+ Import from mainline:
+ 2018-02-13 Nick Clifton <nickc@redhat.com>
+
+ PR 22773
+ * config/tc-arm.c (md_apply_fix): Test Rn field of Thumb ORR
+ instruction before assuming that it is a MOV instruction.
+ * testsuite/gas/arm/pr22773.s: New test.
+ * testsuite/gas/arm/pr22773.d: New test driver.
+ * testsuite/gas/arm/pr22773.l: New expected output.
+
2018-03-21 Alan Modra <amodra@gmail.com>
Apply from master