aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorAlexey Makhalov <makhaloff@gmail.com>2013-11-19 08:19:21 +0000
committerNick Clifton <nickc@redhat.com>2013-11-19 08:19:21 +0000
commitcf3f45fad7811e89d6b586a1a429a314e3db9f53 (patch)
treeb497b4a4e58284778cbb97b8a73efe471fa71d98 /gas
parent077e2c8848810b23531b7fdae1739a5eab83c04f (diff)
downloadgdb-cf3f45fad7811e89d6b586a1a429a314e3db9f53.zip
gdb-cf3f45fad7811e89d6b586a1a429a314e3db9f53.tar.gz
gdb-cf3f45fad7811e89d6b586a1a429a314e3db9f53.tar.bz2
PR gas/16109
* app.c (do_scrub_chars): Only insert a newline character if end-of-file has been reached.
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog6
-rw-r--r--gas/app.c11
2 files changed, 15 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index fddf422..3813336 100644
--- 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 ec3a35e..1a7ce95 100644
--- 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. */