PR gas/16109

	* app.c (do_scrub_chars): Only insert a newline character if
	end-of-file has been reached.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index fddf422d6e3175692776063de080e193719d6408..3813336265e5e0440b2d9869117cbadbc1ab6c51 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-19  Alexey Makhalov  <makhaloff@gmail.com>
+
+       PR gas/16109
+       * app.c (do_scrub_chars): Only insert a newline character if
+       end-of-file has been reached.
+
 2013-11-18  H.J. Lu  <hongjiu.lu@intel.com>
 
        * config/tc-i386.c (lex_got): Add a dummy "int bnd_prefix"

diff --git a/gas/app.c b/gas/app.c
index ec3a35ee865ffdb521ab784e70e38f38d0c6cf6c..1a7ce95289bb75def8cfac775b70d7bf53a6b53d 100644 (file)
--- a/gas/app.c
+++ b/gas/app.c
@@ -1217,9 +1217,16 @@ do_scrub_chars (size_t (*get) (char *, size_t), char *tostart, size_t tolen)
                  while (ch != EOF && !IS_NEWLINE (ch))
                    ch = GET ();
                  if (ch == EOF)
-                   as_warn (_("end of file in comment; newline inserted"));
+                   {
+                     as_warn (_("end of file in comment; newline inserted"));
+                     PUT ('\n');
+                   }
+                 else /* IS_NEWLINE (ch) */
+                   {
+                     /* To process non-zero add_newlines.  */
+                     UNGET (ch);
+                   }
                  state = 0;
-                 PUT ('\n');
                  break;
                }
              /* Looks like `# 123 "filename"' from cpp.  */