(rescan): Do not preserve newlines after macro name if rescanning a macro expansion.

(rescan): Do not preserve newlines after macro name
if rescanning a macro expansion.  Instead, preserve them if
not outputting marks.

From-SVN: r8389

diff --git a/gcc/cccp.c b/gcc/cccp.c
index 0ad85b42803d7764e427d0a87cde26a09c885316..889285b912bd1510d8b007b23a3ec7ead4b94285 100644 (file)
--- a/gcc/cccp.c
+++ b/gcc/cccp.c
@@ -3275,10 +3275,10 @@ startagain:
              /* This is now known to be a macro call.
                 Discard the macro name from the output,
                 along with any following whitespace just copied,
-                but preserve newlines at the top level since this
+                but preserve newlines if not outputting marks since this
                 is more likely to do the right thing with line numbers.  */
              obp = op->buf + obufp_before_macroname;
-             if (ip->macro != 0)
+             if (output_marks)
                op->lineno = op_lineno_before_macroname;
              else {
                int newlines = op->lineno - op_lineno_before_macroname;