[src/trunk]: src/external/gpl3/gcc/dist/libcpp remove obsolete code and merge...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/644e6e7bca4d
branches:  trunk
changeset: 454918:644e6e7bca4d
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Oct 02 03:46:21 2019 +0000

description:
remove obsolete code and merge botch.

diffstat:

 external/gpl3/gcc/dist/libcpp/internal.h |  3 ---
 external/gpl3/gcc/dist/libcpp/macro.c    |  4 ----
 2 files changed, 0 insertions(+), 7 deletions(-)

diffs (48 lines):

diff -r 9bfeae952af4 -r 644e6e7bca4d external/gpl3/gcc/dist/libcpp/internal.h
--- a/external/gpl3/gcc/dist/libcpp/internal.h  Wed Oct 02 02:59:46 2019 +0000
+++ b/external/gpl3/gcc/dist/libcpp/internal.h  Wed Oct 02 03:46:21 2019 +0000
@@ -228,9 +228,6 @@
   /* Nonzero if first token on line is CPP_HASH.  */
   unsigned char in_directive;
 
-  /* Nonzero if we are collecting macro arguments */
-  unsigned char collecting_args;
-
   /* Nonzero if in a directive that will handle padding tokens itself.
      #include needs this to avoid problems with computed include and
      spacing between tokens.  */
diff -r 9bfeae952af4 -r 644e6e7bca4d external/gpl3/gcc/dist/libcpp/macro.c
--- a/external/gpl3/gcc/dist/libcpp/macro.c     Wed Oct 02 02:59:46 2019 +0000
+++ b/external/gpl3/gcc/dist/libcpp/macro.c     Wed Oct 02 03:46:21 2019 +0000
@@ -496,7 +496,6 @@
       {
        unsigned int len;
        const char *name;
-       char *tmp_name;
        uchar *buf;
        
        if (node->value.builtin == BT_FILE)
@@ -515,7 +514,6 @@
        result = buf;
        *buf = '"';
        buf = cpp_quote_string (buf + 1, (const unsigned char *) name, len);
-       free (tmp_name);
        *buf++ = '"';
        *buf = '\0';
       }
@@ -1067,7 +1065,6 @@
   memset (args, 0, argc * sizeof (macro_arg));
   buff->cur = (unsigned char *) &args[argc];
   arg = args, argc = 0;
-  pfile->state.collecting_args = 1;
 
   /* Collect the tokens making up each argument.  We don't yet know
      how many arguments have been supplied, whether too many or too
@@ -1203,7 +1200,6 @@
        }
     }
   while (token->type != CPP_CLOSE_PAREN && token->type != CPP_EOF);
-  pfile->state.collecting_args = 0;
 
   if (token->type == CPP_EOF)
     {