summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2020-09-19 08:16:20 +0100
committerNick Clifton <nickc@redhat.com>2020-09-19 08:16:20 +0100
commit4dce688b93484c74c46660fce3499258fa1f2414 (patch)
treeb7188dfb579d1159d7be6056d1e51f66aa8f95dd
parent6e9d358c81d97deb4613d709f13fc68efdb63a3c (diff)
downloadbinutils-gdb-4dce688b93484c74c46660fce3499258fa1f2414.tar.gz
Import patch from mainline: 2020-09-15 Nick Clifton <nickc@redhat.com>
* read.c (s_nop): Preserve the input_line_pointer around the call to md_assemble. * config/tc-s12z.c (md_assemble): Revert previous delta.
-rw-r--r--gas/ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index ec4bea89dcc..1217276aa23 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,12 @@
+2020-09-19 Nick Clifton <nickc@redhat.com>
+
+ Import from mainline:
+ 2020-09-15 Nick Clifton <nickc@redhat.com>
+
+ * read.c (s_nop): Preserve the input_line_pointer around the call
+ to md_assemble.
+ * config/tc-s12z.c (md_assemble): Revert previous delta.
+
2020-09-15 Nick Clifton <nickc@redhat.com>
Import from mainline: