* Makefile.in (c-common.o): Don't depend on c-tree.h or c-lex.h.

	* c-common.c (ridpointers): Declare.
	* c-common.h (enum rid): Declare.
	(NORID): Likewise.
	(ridpointers): Likewise.
	* c-lex.c (ridpointers): Don't declare.
	(init_lex): Initialize ridpointers.
	* c-lex.h (enum rid): Don't declare.
	(NORID): Likewise.
	(RID_FIRST_MODIFIER): Likewise.
	(ridpointers): Likewise.

	* cp-tree.h (ridpointers): Don't declare.
	* decl.c (record_builtin_type): Use CP_RID_MAX instead of RID_MAX.
	(record_builtin_java_type): Likewise.
	(init_decl_processing): Likewise.
	* lex.c: Move inclusion of lex.h.
	(ridpointers): Don't define.
	(init_parse): Initialize ripdointers.  Use CP_RID_MAX instead of
	RID_MAX.
	* lex.h (enum rid): Rename to ...
	(enum cp_rid): ... this.
	(ridpointers): Don't declare.
	* parse.y: Move inclusion of lex.h.
	* parse.c: Regenerated.
	* spew.c: Move inclusion of lex.h.

	* cp-tree.h (struct language_function): Remove temp_name_counter.
	(temp_name_counter): Remove.
	(get_temp_name): Change prototype.
	(get_guard): New function.
	(get_guard_cond): Likewise.
	(set_guard): Likewise.
	* cvt.c (build_up_reference): Adjust call to get_temp_name.
	* decl.c (expand_static_init): Use get_guard and friends to
	implement guard variables.
	* decl2.c (get_temp_name): Assume that the variables created are
	always static.
	(get_sentry): Rename to ...
	(get_guard): ... this.  Implement new ABI guard	variables.
	(get_guard_bits): New function.
	(get_guard_cond): Likewise.
	(set_guard): Likewise.
	(start_static_initialization_or_destruction): Use them.
	(do_static_initialization): Replace sentry with guard throughout.
	(do_static_destruction): Likewise.
	* init.c (create_temporary_var): Add comment.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34815 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 1 insertions, 5 deletions

diff --git a/gcc/c-lex.c b/gcc/c-lex.c
index 8b917ff56a2..f720a3f9b47 100644
--- a/gcc/c-lex.c
+++ b/gcc/c-lex.c
@@ -62,11 +62,6 @@ FILE *finput;
 
 extern void yyprint			PARAMS ((FILE *, int, YYSTYPE));
 
-/* The elements of `ridpointers' are identifier nodes
-   for the reserved type names and storage classes.
-   It is indexed by a RID_... value.  */
-tree ridpointers[(int) RID_MAX];
-
 /* Cause the `yydebug' variable to be defined.  */
 #define YYDEBUG 1
 
@@ -284,6 +279,7 @@ init_lex ()
   maxtoken = 40;
   token_buffer = (char *) xmalloc (maxtoken + 2);
 
+  ridpointers = (tree *) xcalloc ((int) RID_MAX, sizeof (tree));
   ridpointers[(int) RID_INT] = get_identifier ("int");
   ridpointers[(int) RID_CHAR] = get_identifier ("char");
   ridpointers[(int) RID_VOID] = get_identifier ("void");