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.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index ec4bea89dcc6b794df0716931c292411f00b0e4b..1217276aa233d2f5533883cc838a2a1933c14030 100644 (file)
--- 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: