3 files changed, 11 insertions, 18 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index e2a115f51d7..284665932ed 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-09  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+	* jcf-parse.c (init_lex): Remove.
+	* lang.c (language_string, lang_identify): Remove.
+	(struct lang_hooks): Constify.
+	(LANG_HOOKS_NAME): Override.
+	(init_parse): Update.
+
 2001-11-08  Andreas Franck  <afranck@gmx.de>
 
 	* Make-lang.in (JAVA_INSTALL_NAME, JAVA_CROSS_NAME): Handle 
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 75e0a23c582..6190cf358e5 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -262,13 +262,6 @@ parse_signature (jcf, sig_index)
 }
 
 void
-init_lex ()
-{
-  /* Make identifier nodes long enough for the language-specific slots.  */
-  set_identifier_size (sizeof (struct lang_identifier));
-}
-
-void
 set_yydebug (value)
      int value;
 {
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index 91114b19e1f..feeb89ae0d7 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -99,8 +99,6 @@ static const char *const java_tree_code_name[] = {
 
 int compiling_from_source;
 
-const char * const language_string = "GNU Java";
-
 char * resource_name;
 
 int flag_emit_class_files = 0;
@@ -197,6 +195,8 @@ static int dependency_tracking = 0;
 #define DEPEND_TARGET_SET 4
 #define DEPEND_FILE_ALREADY_SET 8
 
+#undef LANG_HOOKS_NAME
+#define LANG_HOOKS_NAME "GNU Java"
 #undef LANG_HOOKS_INIT
 #define LANG_HOOKS_INIT java_init
 #undef LANG_HOOKS_INIT_OPTIONS
@@ -205,7 +205,7 @@ static int dependency_tracking = 0;
 #define LANG_HOOKS_DECODE_OPTION java_decode_option
 
 /* Each front end provides its own.  */
-struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;
+const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;
 
 /* Process an option that can accept a `no-' form.
    Return 1 if option found, 0 otherwise.  */
@@ -474,8 +474,6 @@ init_parse (filename)
 	}
     }
 
-  init_lex ();
-
   return filename;
 }
 
@@ -744,12 +742,6 @@ java_init_options ()
   flag_non_call_exceptions = 1;
 }
 
-const char *
-lang_identify ()
-{
-  return "Java";
-}
-
 /* Hooks for print_node.  */
 
 void