* Makefile.in (OBJS, LIBCPP_OBJS, LIBCPP_DEPS,

	cpplib.o, cpphash.o, fix-header): Update.
	(hashtable.o): New target.
	* c-common.h: Include cpplib.h.  Define C_RID_CODE and
	struct c_common_identifier here.
	* c-lang.c (c_init_options): Update.  Call set_identifier_size.
	* c-lex.c (c_lex): Update.
	* c-pragma.h: Update.
	* c-tree.h (struct lang_identifier): Contain c_common_identifier.
	Delete rid_code.
	(C_RID_CODE): Delete.
	* cpphash.c: Rewrite to use hashtable.c.
	* cpphash.h: Update include guards.
	(struct cpp_reader): Remove hashtab.
	hash_ob and buffer_ob are no longer pointers.  Add hash_table
	and our_hashtable.
	(HASHSTEP, _cpp_init_hashtable,	_cpp_lookup_with_hash): Delete.
	(_cpp_cleanup_hashtable): Rename _cpp_destroy_hashtable.
	(_cpp_cleanup_stacks): Rename _cpp_init_directives.
	* cppinit.c (cpp_create_reader): Update.
	* cpplex.c (cpp_ideq, parse_identifier, cpp_output_token): Update.
	(cpp_interpret_charconst): Eliminate warning.
	* cpplib.c (do_pragma, do_endif, push_conditional,
	cpp_push_buffer, cpp_pop_buffer): Update.
	(_cpp_init_stacks): Rename cpp_init_directives.
	(_cpp_cleanup_stacks): Remove.
	* cpplib.h: Update include guards.  Include tree-core.h and c-rid.h.
	(cpp_hashnode, cpp_token, NODE_LEN, NODE_NAME,
	 cpp_forall_identifiers, cpp_create_reader): Update.
	(C_RID_CODE, cpp_make_node): New.
	(c_common_identifier): New identifier node for C front ends.
	* cppmain.c (main): Update.
	* fix-header.c (read_scan_file): Update.
	* flags.h (id_clash_len): Make unsigned.
	* ggc.h (ggc_mark_nonnull_tree): New.
	* hashtable.c: New.
	* hashtable.h: New.
	* stringpool.c: Update comments and copyright.  Update to use
	hashtable.c.
	* toplev.c (approx_sqrt): Move to hashtable.c.
	(id_clash_len): Make unsigned.
	* toplev.h (ident_hash): New.
	* tree.c (gcc_obstack_init): Move to hashtable.c.
	* tree.h: Include hashtable.h.
	(IDENTIFIER_POINTER, IDENTIFIER_LENGTH): Update.
	(GCC_IDENT_TO_HT_IDENT, HT_IDENT_TO_GCC_IDENT): New.
	(struct tree_identifier): Update.
	(make_identifier): New.
cp:
	* cp-tree.h (struct lang_identifier, C_RID_YYCODE): Update.
	(C_RID_CODE): Remove.
	* lex.c (cxx_init_options): Call set_identifier_size.  Update.
	(init_parse): Don't do it here.
objc:
	* objc-act.c (objc_init_options): Call set_identifier_size. Update.


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

1 files changed, 7 insertions, 20 deletions

diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index b5bdd946600..96d296f3b5a 100644
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -1043,12 +1043,12 @@ do_pragma (pfile)
   if (tok.type == CPP_NAME)
     {
       const cpp_hashnode *node = tok.val.node;
-      const U_CHAR *name = NODE_NAME (node);
       size_t len = NODE_LEN (node);
 
       while (p)
 	{
-	  if (strlen (p->name) == len && !memcmp (p->name, name, len))
+	  if (strlen (p->name) == len
+	      && !memcmp (p->name, NODE_NAME (node), len))
 	    {
 	      if (p->isnspace)
 		{
@@ -1403,7 +1403,7 @@ do_endif (pfile)
 
       buffer->if_stack = ifs->next;
       buffer->was_skipping = ifs->was_skipping;
-      obstack_free (pfile->buffer_ob, ifs);
+      obstack_free (&pfile->buffer_ob, ifs);
     }
 
   check_eol (pfile);
@@ -1423,7 +1423,7 @@ push_conditional (pfile, skip, type, cmacro)
   struct if_stack *ifs;
   cpp_buffer *buffer = pfile->buffer;
 
-  ifs = xobnew (pfile->buffer_ob, struct if_stack);
+  ifs = xobnew (&pfile->buffer_ob, struct if_stack);
   ifs->pos = pfile->directive_pos;
   ifs->next = buffer->if_stack;
   ifs->was_skipping = buffer->was_skipping;
@@ -1804,7 +1804,7 @@ cpp_push_buffer (pfile, buffer, len, type, filename)
      enum cpp_buffer_type type;
      const char *filename;
 {
-  cpp_buffer *new = xobnew (pfile->buffer_ob, cpp_buffer);
+  cpp_buffer *new = xobnew (&pfile->buffer_ob, cpp_buffer);
 
   if (type == BUF_FAKE)
     {
@@ -1905,22 +1905,17 @@ cpp_pop_buffer (pfile)
 		   buffer->nominal_fname);
     }
 
-  obstack_free (pfile->buffer_ob, buffer);
+  obstack_free (&pfile->buffer_ob, buffer);
   return pfile->buffer;
 }
 
-#define obstack_chunk_alloc xmalloc
-#define obstack_chunk_free free
 void
-_cpp_init_stacks (pfile)
+_cpp_init_directives (pfile)
      cpp_reader *pfile;
 {
   unsigned int i;
   cpp_hashnode *node;
 
-  pfile->buffer_ob = xnew (struct obstack);
-  obstack_init (pfile->buffer_ob);
-
   /* Register the directives.  */
   for (i = 0; i < (unsigned int) N_DIRECTIVES; i++)
     {
@@ -1928,11 +1923,3 @@ _cpp_init_stacks (pfile)
       node->directive_index = i + 1;
     }
 }
-
-void
-_cpp_cleanup_stacks (pfile)
-     cpp_reader *pfile;
-{
-  obstack_free (pfile->buffer_ob, 0);
-  free (pfile->buffer_ob);
-}