langhooks.c: Don't include gt-langhooks.h.

	* langhooks.c: Don't include gt-langhooks.h.
	(var_labelno): Delete.
	(lhd_set_decl_assembler_name): Do not append a distinguishing
	number to file-scope internal-linkage declarations for the first
	input file, even if they have DECL_CONTEXT set.  Use DECL_UID of
	the declaration itself (if at block scope), or its containing
	TRANSLATION_UNIT_DECL (if at file scope) for the distinguishing
	number.

	* opts.c (cur_in_fname): New global.
	* opts.h: Declare it.
	* tree.c: Include opts.h.
	(make_node_stat): If creating a TRANSLATION_UNIT_DECL, give it
	DECL_UID equal to cur_in_fname.
	(copy_node_stat): Do not change DECL_UID when copying a
	TRANSLATION_UNIT_DECL.
	(build_common_tree_nodes): Adjust next_decl_uid to reserve the
	range 0 .. num_in_fnames-1 for TRANSLATION_UNIT_DECLs.

	* c-decl.c (c_static_assembler_name): Delete.
	* c-tree.h (c_static_assembler_name): Delete prototype.
	* c-lang.c, objc/objc-lang.c: Don't override
	LANG_HOOKS_SET_DECL_ASSEMBLER_NAME.

	* Makefile.in (tree.o): Update dependencies.
	(GTFILES): Remove langhooks.c.

cp:
	* decl.c (cxx_init_decl_processing): Call
	build_common_tree_nodes before creating the global NAMESPACE_DECL.

From-SVN: r84123

2 files changed, 17 insertions, 12 deletions

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a760aa9..77aaf45 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-05  Zack Weinberg  <zack@codesourcery.com>
+
+	* decl.c (cxx_init_decl_processing): Call
+	build_common_tree_nodes before creating the global NAMESPACE_DECL.
+
 2004-07-05  Giovanni Bajo  <giovannibajo@gcc.gnu.org>
 
 	PR c++/2518
@@ -197,12 +202,12 @@
 
 2004-06-27  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
-	PR c++/14123	
+	PR c++/14123
 	* cxx-pretty-print.c (pp_cxx_ptr_operator): Properly put
 	paranthesis in case of pointers to array members.
 	* error.c (dump_type_prefix): Likewise.
 	(dump_type_suffix): Maybe issue a whitespace when printing
-	ARRAY_TYPE. 
+	ARRAY_TYPE.
 
 2004-06-27  Mark Mitchell  <mark@codesourcery.com>
 
@@ -219,12 +224,12 @@
 	(pp_non_consecutive_character): Likewise.
 	(dump_scope): Use pp_cxx_colon_colon.
 	(dump_template_parameter): Use pp_cxx_identifier,
-	pp_cxx_tree_identifier and pp_cxx_whitespace. 
+	pp_cxx_tree_identifier and pp_cxx_whitespace.
 	(dump_templat_bindings): Replace use of pp_string with sequence
 	of pp_cxx_whitespace and pp_equal.
 	(dump_type): Use pp_cxx_identifier, pp_cxx_tree_identifier,
 	pp_cxx_colon_colon, pp_cxx_whitespace throughout.  Don't set
-	padding here. 
+	padding here.
 	(dump_aggr_type): Use pp_cxx_identifier amd pp_cxx_tree_identifier.
 	(dump_type_prefix): Don't set padding.  Use pp_cxx_whitespace,
 	pp_cxx_left_parent, pp_cxx_colon_colon and pp_cxx_star troughout.
@@ -234,17 +239,17 @@
 	(dump_template_decl): Likewise.
 	(dump_function_decl): Likewise.  Set padding as appropriate.
 	(dump_parameters): Use pp_cxx_left_paren, pp_cxx_identifier and
-	pp_cxx_right_paren. 
+	pp_cxx_right_paren.
 	(dump_exception_spec): Likewise.
 	(dump_function_name): Use pp_cxx_tree_identifier and
-	pp_cxx_identifier. 
+	pp_cxx_identifier.
 	(dump_template_parms): Use pp_cxx_begin_template_argument_list and
 	pp_cxx_end_template_argument_list.
 	(dump_expr): Use pp_cxx_left_paren, pp_cxx_right_paren,
 	pp_cxx_colon_colon, pp_cxx_identifier, pp_cxx_tree_identifier and
-	pp_cxx_whitespace throughout. 
+	pp_cxx_whitespace throughout.
 	(dump_binary_op): Use pp_cxx_whitespace, pp_cxx_left_paren and
-	pp_cxx_right_paren. 
+	pp_cxx_right_paren.
 	(dump_unary_op): Likewise.
 	(reinit_cxx_pp): New function.
 	(type_as_string); Use it.
@@ -399,8 +404,8 @@
 	(cp_parser_set_decl_spec_type): Likewise.
 	* pt.c: Do not include lex.h.
 	* semantics.c: Likewise.
-	(finish_member_class_template): Remove.	
-	
+	(finish_member_class_template): Remove.
+
 2004-06-23  Roger Sayle  <roger@eyesopen.com>
 
 	* call.c (build_cxx_call): Don't call expand_tree_builtin.  No
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index e591a25..bee0402 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -2887,6 +2887,8 @@ cxx_init_decl_processing (void)
   tree void_ftype;
   tree void_ftype_ptr;
 
+  build_common_tree_nodes (flag_signed_char);
+
   /* Create all the identifiers we need.  */
   initialize_predefined_identifiers ();
 
@@ -2926,8 +2928,6 @@ cxx_init_decl_processing (void)
   /* Initially, C.  */
   current_lang_name = lang_name_c;
 
-  build_common_tree_nodes (flag_signed_char);
-
   error_mark_list = build_tree_list (error_mark_node, error_mark_node);
   TREE_TYPE (error_mark_list) = error_mark_node;