c-lang.c (LANG_HOOKS_NAME): New.

	* c-lang.c (LANG_HOOKS_NAME): New.
	(lang_hooks): Constify.
	(c_init_options): Update.
	(lang_identify): Remove.
	* c-parse.in (language_string): Remove.
	* dbxout.c: Include langhooks.h.
	(dbxout_symbol_location): Update.
	* dwarf2out.c: Include langhooks.h.
	(gen_compile_unit_die): Update.
	* dwarfout.c: Include langhooks.h.
	(prototyped_attribute, output_compile_unit_die): Update.
	* langhooks-def.h (LANG_HOOKS_NAME, LANG_HOOKS_IDENTIFIER_SIZE): New.
	(LANG_HOOKS_INITIALIZER): Update.
	* langhooks.h (struct lang_hooks): New members.  Constify.
	* stringpool.c: Don't include toplev.h.
	(set_identifier_size): Remove.
	* toplev.c (toplev_main): Initialize identifier size.
	(print_version): Update.
	* tree.h (language_string, init_lex, lang_identify,
	set_identifier_size): Remove.
	* Makefile.in: Update dependencies.
	* config/darwin.c: Include langhooks.h.
	(func_name_maybe_scoped): Update.
	* config/darwin.h (ASM_END_FILE): Update.
	* config/nextstep.h (ASM_END_FILE): Update.
	* config/nextstep21.h (ASM_END_FILE): Update.
	* config/i386/sun386.h (ASM_END_FILE): Update.
	* config/rs6000/rs6000.c (ASM_END_FILE): Include langhooks.h.
	(rs6000_output_function_epilogue): Update.
ada:
	* misc.c (LANG_HOOKS_NAME, LANG_HOOKS_IDENTIFIER_SIZE): Override.
	(struct lang_hooks): Constify.
	(language_string, lang_identify): Remove.
	* utils.c (init_decl_processing): Update.
cp:
	* cp-lang.c (LANG_HOOKS_NAME): Override.
	(struct lang_hooks): Constify.
	* lex.c (cxx_init_options): Update.
	(lang_identify): Remove.
	* parse.y (language_string): Remove.
f:
	* com.c (language_string, lang_identify): Remove.
	(struct lang_hooks): Constify.
	(LANG_HOOKS_NAME): Override.
	(init_parse): Update.
java:
	* jcf-parse.c (init_lex): Remove.
	* lang.c (language_string, lang_identify): Remove.
	(struct lang_hooks): Constify.
	(LANG_HOOKS_NAME): Override.
	(init_parse): Update.
objc:
	* objc-act.c (LANG_HOOKS_NAME): Override.
	(struct lang_hooks): Constify.
	(objc_init_options): Update.
	(lang_identify): Remove.

From-SVN: r46874

6 files changed, 8 insertions, 5 deletions

diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 158f375..caf8120 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -37,6 +37,7 @@ Boston, MA 02111-1307, USA.  */
 #include "reload.h"
 #include "function.h"
 #include "ggc.h"
+#include "langhooks.h"
 
 #include "darwin-protos.h"
 
@@ -565,7 +566,7 @@ func_name_maybe_scoped (fname)
 {
 
   if (is_cplusplus < 0)
-    is_cplusplus = (strcmp (lang_identify (), "cplusplus") == 0);
+    is_cplusplus = (strcmp (lang_hooks.name, "GNU C++") == 0);
 
   if (is_cplusplus)
     {
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index a7a96f3..2b1826d 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -175,7 +175,7 @@ do { text_section ();							\
 #define ASM_FILE_END(FILE)					\
   do {								\
     machopic_finish (asm_out_file);                             \
-    if (strcmp (language_string, "GNU C++") == 0)		\
+    if (strcmp (lang_hooks.name, "GNU C++") == 0)		\
       {								\
 	constructor_section ();					\
 	destructor_section ();					\
diff --git a/gcc/config/i386/sun386.h b/gcc/config/i386/sun386.h
index 3f3ba30..20d48c9 100644
--- a/gcc/config/i386/sun386.h
+++ b/gcc/config/i386/sun386.h
@@ -76,7 +76,7 @@ do								\
       fprintf (FILE, "\n");				\
     }							\
     fprintf (FILE, "\t.version\t\"%s %s\"\n",		\
-	     language_string, version_string);		\
+	     lang_hooks.name, version_string);		\
     if (optimize) ASM_FILE_START_1 (FILE);		\
   } while (0)
 
diff --git a/gcc/config/nextstep.h b/gcc/config/nextstep.h
index 8275843..4be9e71 100644
--- a/gcc/config/nextstep.h
+++ b/gcc/config/nextstep.h
@@ -229,7 +229,7 @@ extern void nextstep_asm_out_destructor  PARAMS ((struct rtx_def *, int));
 #undef	ASM_FILE_END
 #define ASM_FILE_END(FILE)					\
   do {								\
-    if (strcmp (language_string, "GNU C++") == 0)		\
+    if (strcmp (lang_hooks.name, "GNU C++") == 0)		\
       {								\
 	constructor_section ();					\
 	destructor_section ();					\
diff --git a/gcc/config/nextstep21.h b/gcc/config/nextstep21.h
index 40004d1..7827054 100644
--- a/gcc/config/nextstep21.h
+++ b/gcc/config/nextstep21.h
@@ -43,7 +43,7 @@ Boston, MA 02111-1307, USA.  */
 #undef ASM_FILE_END
 #define ASM_FILE_END(FILE)					\
   do {								\
-      if (strcmp (language_string, "GNU C++") == 0)		\
+      if (strcmp (lang_hooks.name, "GNU C++") == 0)		\
       {								\
 	ASM_OUTPUT_ALIGN (FILE, 1);				\
       }								\
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 0cf9b9c..fc7ed61 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -46,6 +46,7 @@ Boston, MA 02111-1307, USA.  */
 #include "tm_p.h"
 #include "target.h"
 #include "target-def.h"
+#include "langhooks.h"
 
 #ifndef TARGET_NO_PROTOTYPE
 #define TARGET_NO_PROTOTYPE 0
@@ -7499,6 +7500,7 @@ rs6000_output_function_epilogue (file, size)
   if (DEFAULT_ABI == ABI_AIX && ! flag_inhibit_size_directive)
     {
       const char *fname = XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0);
+      const char *language_string = lang_hooks.name;
       int fixed_parms, float_parms, parm_info;
       int i;