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

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 1f441b19b9d3f85c4d8da59f11da6a22b8ed208e..b246de782dab1b6ae102aa1e1fe0d7551e7367c5 100644 (file)
--- 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 5e596699e017745c69736d40de7e016e2cf79144..7d65886a390c8868fca520635ddb3d484770a996 100644 (file)
--- 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;
        }