* 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, 9 insertions, 46 deletions

diff --git a/gcc/cp/lex.h b/gcc/cp/lex.h
index 456fdeeb1b4..7d00129d807 100644
--- a/gcc/cp/lex.h
+++ b/gcc/cp/lex.h
@@ -21,18 +21,17 @@ can know your rights and responsibilities.  It should be in a
 file named COPYING.  Among other things, the copyright notice
 and this notice must be preserved on all copies.  */
 
-
-
-enum rid
+enum cp_rid
 {
-  RID_UNUSED,
-  RID_INT,
+  RID_FRIEND = RID_MAX,
+  RID_VIRTUAL,
+  RID_EXPLICIT,
+  RID_EXPORT,
+  RID_MUTABLE,
+  RID_LAST_MODIFIER = RID_MUTABLE,
+
   RID_BOOL,
-  RID_CHAR,
   RID_WCHAR,
-  RID_FLOAT,
-  RID_DOUBLE,
-  RID_VOID,
 
   /* C++ extension */
   RID_CLASS,
@@ -41,37 +40,6 @@ enum rid
   RID_ENUM,
   RID_LONGLONG,
 
-  /* This is where grokdeclarator starts its search when setting the specbits.
-     The first seven are in the order of most frequently used, as found
-     building libg++.  */
-  RID_FIRST_MODIFIER,
-
-  RID_EXTERN = RID_FIRST_MODIFIER,
-  RID_CONST,
-  RID_LONG,
-  RID_TYPEDEF,
-  RID_UNSIGNED,
-  RID_SHORT,
-  RID_INLINE,
-
-  RID_STATIC,
-
-  RID_REGISTER,
-  RID_VOLATILE,
-  RID_FRIEND,
-  RID_VIRTUAL,
-  RID_EXPLICIT,
-  RID_EXPORT,
-  RID_SIGNED,
-  RID_AUTO,
-  RID_MUTABLE,
-  RID_COMPLEX,
-  RID_RESTRICT,
-
-  RID_LAST_MODIFIER = RID_RESTRICT,
-  /* This is where grokdeclarator ends its search when setting the
-     specbits.  */
-
   RID_PUBLIC,
   RID_PRIVATE,
   RID_PROTECTED,
@@ -80,7 +48,7 @@ enum rid
   RID_NULL,
   /* Before adding enough to get up to 64, the RIDBIT_* macros
      will have to be changed a little.  */
-  RID_MAX
+  CP_RID_MAX
 };
 
 /* The type that can represent all values of RIDBIT.  */
@@ -106,11 +74,6 @@ typedef struct { unsigned long idata[2]; }
 				 } while (0)
 #define RIDBIT_ANY_SET(V) ((V).idata[0] || (V).idata[1])
 
-/* The elements of `ridpointers' are identifier nodes
-   for the reserved type names and storage classes.
-   It is indexed by a RID_... value.  */
-extern tree ridpointers[(int) RID_MAX];
-
 /* the declaration found for the last IDENTIFIER token read in.
    yylex must look this up to detect typedefs, which get token type TYPENAME,
    so it is left around in case the identifier is not a typedef but is