aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/cppmain.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0e509a9..a29f68c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-01 Richard Henderson <rth@redhat.com>
+
+ * cppmain.c (scan_buffer): Don't avoid paste for assembly.
+
2000-11-01 Neil Booth <neilb@earthling.net>
* c-parse.in (_yylex): Remove CPP_BACKSLASH case.
diff --git a/gcc/cppmain.c b/gcc/cppmain.c
index 3304c15..ca966fc 100644
--- a/gcc/cppmain.c
+++ b/gcc/cppmain.c
@@ -196,7 +196,9 @@ scan_buffer (pfile)
putc (' ', print.outf);
}
}
- else if (print.printed && ! (token->flags & PREV_WHITE)
+ else if (print.printed
+ && ! (token->flags & PREV_WHITE)
+ && ! CPP_OPTION (pfile, lang_asm)
&& cpp_avoid_paste (pfile, &tokens[1 - index], token))
token->flags |= PREV_WHITE;