re PR preprocessor/20282 (gcc4 can not bootstrap itself anymore)

PR bootstrap/20282
	PR bootstrap/20305
	* macro.c (replace_args, cpp_get_token): Copy whole
	cpp_token_u instead of just cpp_string field from it.

From-SVN: r95887
This commit is contained in:
Jakub Jelinek 2005-03-04 16:33:23 +01:00 committed by Jakub Jelinek
parent 7445392c29
commit 730967114b
2 changed files with 9 additions and 2 deletions

View file

@ -1,3 +1,10 @@
2005-03-04 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/20282
PR bootstrap/20305
* macro.c (replace_args, cpp_get_token): Copy whole
cpp_token_u instead of just cpp_string field from it.
2005-02-28 Devang Patel <dpatel@apple.com>
* directives.c (do_line): Save sysp early before line table is

View file

@ -886,7 +886,7 @@ replace_args (cpp_reader *pfile, cpp_hashnode *node, cpp_macro *macro, macro_arg
{
cpp_token *token = _cpp_temp_token (pfile);
token->type = (*paste_flag)->type;
token->val.str = (*paste_flag)->val.str;
token->val = (*paste_flag)->val;
if (src->flags & PASTE_LEFT)
token->flags = (*paste_flag)->flags | PASTE_LEFT;
else
@ -1120,7 +1120,7 @@ cpp_get_token (cpp_reader *pfile)
cpp_token *t = _cpp_temp_token (pfile);
t->type = result->type;
t->flags = result->flags | NO_EXPAND;
t->val.str = result->val.str;
t->val = result->val;
result = t;
}