* app.c (do_scrub_chars): In MRI mode, keep a space before a

	possible comment character.
	* config/tc-m68k.c (m68k_ip): In MRI mode, ignore anything after
	an instruction which takes no operands.

1 files changed, 7 insertions, 0 deletions

diff --git a/gas/app.c b/gas/app.c
index 7b7ea15..a858163 100644
--- a/gas/app.c
+++ b/gas/app.c
@@ -587,6 +587,13 @@ do_scrub_chars (get, tostart, tolen)
 	      /* cpp never outputs a leading space before the #, so
 		 try to avoid being confused.  */
 	      not_cpp_line = 1;
+	      if (flag_mri)
+		{
+		  /* In MRI mode, we keep these spaces.  */
+		  UNGET (ch);
+		  PUT (' ');
+		  break;
+		}
 	      goto recycle;
 	    }