diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-03-04 16:33:23 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2005-03-04 16:33:23 +0100 |
| commit | 730967114bbf3cc902659a26cf43e5005c86977a (patch) | |
| tree | 421272499f1b4f88b03e1b37bb0db355e0350e71 /libcpp | |
| parent | 7445392c29b2b16391e41bee61cfbe32d492ddf5 (diff) | |
| download | gcc-730967114bbf3cc902659a26cf43e5005c86977a.zip gcc-730967114bbf3cc902659a26cf43e5005c86977a.tar.gz gcc-730967114bbf3cc902659a26cf43e5005c86977a.tar.bz2 | |
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
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 7 | ||||
| -rw-r--r-- | libcpp/macro.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 1f441b1..b246de7 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -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 diff --git a/libcpp/macro.c b/libcpp/macro.c index 5e59669..7d65886 100644 --- a/libcpp/macro.c +++ b/libcpp/macro.c @@ -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; } |