aboutsummaryrefslogtreecommitdiff
path: root/gcc/cpphash.c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/cpphash.c')
-rw-r--r--gcc/cpphash.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/gcc/cpphash.c b/gcc/cpphash.c
index 8c4be52..b7f3944 100644
--- a/gcc/cpphash.c
+++ b/gcc/cpphash.c
@@ -576,6 +576,11 @@ save_expansion (pfile, info)
dest->flags = token[-1].flags | STRINGIFY_ARG;
else
dest->flags = token->flags; /* Particularly PREV_WHITE. */
+ /* Turn off PREV_WHITE if we immediately follow a paste.
+ That way, even if the paste turns out to be illegal, there
+ will be no space between the two tokens in the output. */
+ if (token[-1].type == CPP_PASTE)
+ dest->flags &= ~PREV_WHITE;
dest++;
continue;
@@ -602,6 +607,8 @@ save_expansion (pfile, info)
dest->val.str.text = buf;
buf += dest->val.str.len;
}
+ if (token[-1].type == CPP_PASTE)
+ dest->flags &= ~PREV_WHITE;
dest++;
}