Module Name:src
Committed By: mrg
Date: Wed Oct 2 03:46:21 UTC 2019
Modified Files:
src/external/gpl3/gcc/dist/libcpp: internal.h macro.c
Log Message:
remove obsolete code and merge botch.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/dist/libcpp/internal.h
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/libcpp/macro.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libcpp/internal.h
diff -u src/external/gpl3/gcc/dist/libcpp/internal.h:1.7 src/external/gpl3/gcc/dist/libcpp/internal.h:1.8
--- src/external/gpl3/gcc/dist/libcpp/internal.h:1.7 Tue Oct 1 10:38:21 2019
+++ src/external/gpl3/gcc/dist/libcpp/internal.h Wed Oct 2 03:46:21 2019
@@ -228,9 +228,6 @@ struct lexer_state
/* 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. */
Index: src/external/gpl3/gcc/dist/libcpp/macro.c
diff -u src/external/gpl3/gcc/dist/libcpp/macro.c:1.9 src/external/gpl3/gcc/dist/libcpp/macro.c:1.10
--- src/external/gpl3/gcc/dist/libcpp/macro.c:1.9 Tue Oct 1 10:38:21 2019
+++ src/external/gpl3/gcc/dist/libcpp/macro.c Wed Oct 2 03:46:21 2019
@@ -496,7 +496,6 @@ _cpp_builtin_macro_text (cpp_reader *pfi
{
unsigned int len;
const char *name;
- char *tmp_name;
uchar *buf;
if (node->value.builtin == BT_FILE)
@@ -515,7 +514,6 @@ _cpp_builtin_macro_text (cpp_reader *pfi
result = buf;
*buf = '"';
buf = cpp_quote_string (buf + 1, (const unsigned char *) name, len);
- free (tmp_name);
*buf++ = '"';
*buf = '\0';
}
@@ -1067,7 +1065,6 @@ collect_args (cpp_reader *pfile, const c
memset (args, 0, argc * sizeof (macro_arg));
buff->cur = (unsigned char *) [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 @@ collect_args (cpp_reader *pfile, const c
}
}
while (token->type != CPP_CLOSE_PAREN && token->type != CPP_EOF);
- pfile->state.collecting_args = 0;
if (token->type == CPP_EOF)
{
