Makefile.in, [...]: Remove handling of lang-options.h and options_.h.

	* Makefile.in, configure, configure.in: Remove handling of
	lang-options.h and options_.h.
	* toplev.c (struct lang_opt, documented_lang_options): Remove.
	(display_help): Don't use documented_lang_options.
ada:
	* lang-options.h: Remove.
	* lang.opt: Add help text.
java:
	* lang-options.h: Remove.
	* lang.opt: Add help text.

From-SVN: r69544

3 files changed, 27 insertions, 65 deletions

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 07f5bcc..bc27074 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-18  Neil Booth  <neil@daikokuya.co.uk>
+
+	* lang-options.h: Remove.
+	* lang.opt: Add help text.
+
 2003-07-15  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* expr.c: Remove the last argument to expand_assignment().
diff --git a/gcc/java/lang-options.h b/gcc/java/lang-options.h
deleted file mode 100644
index e0e69ee..0000000
--- a/gcc/java/lang-options.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Switch definitions for the GNU compiler for the Java(TM) language.
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
-   Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  
-
-Java and all Java-based marks are trademarks or registered trademarks
-of Sun Microsystems, Inc. in the United States and other countries.
-The Free Software Foundation is independent of Sun Microsystems, Inc.  */
-
-/* This is the contribution to the `documented_lang_options' array in
-   toplev.c for java.  */
-
-DEFINE_LANG_NAME ("Java")
-
-  { "-fbounds-check", "" },
-  { "-fno-bounds-check",
-    N_("Disable automatic array bounds checking") },
-  { "-fno-store-check",
-    N_("Disable assignability checks for stores into object arrays") },
-  { "-fjni",
-    N_("Assume native functions are implemented using JNI") },
-  { "--bootclasspath",
-    N_("Replace system path") },
-  { "--classpath",
-    N_("Set class path") },
-  { "--CLASSPATH",
-    N_("Set class path (deprecated: use --classpath instead)") },
-  { "--main",
-    N_("Choose class whose main method should be used") },
-  { "--encoding",
-    N_("Choose input encoding (default comes from locale)") },
-  { "-I",
-    N_("Add directory to class path") },
-  { "-d",
-    N_("Directory where class files should be written") },
-  { "-Wredundant-modifiers", 
-    N_("Warn if modifiers are specified when not necessary") },
-  { "-Wextraneous-semicolon",
-    N_("Warn if deprecated empty statements are found") },
-  { "-Wout-of-date",
-    N_("Warn if .class files are out of date") },
-  { "-Wdeprecated",
-    N_("Warn if deprecated class, method, or field is used") },
-  { "-fforce-classes-archive-check", 
-    N_("Always check for non gcj generated classes archives") },
-  { "-fno-optimize-static-class-initialization",
-    N_("Never optimize static class initialization code") },
-  { "-findirect-dispatch",
-    N_("Use offset tables for virtual method calls") },
diff --git a/gcc/java/lang.opt b/gcc/java/lang.opt
index ed8d02e..6fd0a60 100644
--- a/gcc/java/lang.opt
+++ b/gcc/java/lang.opt
@@ -27,45 +27,59 @@ Java
 
 I
 Java Joined
+; Documented for C
 
 M
 Java
+; Documented for C
 
 MD_
 Java
+; Documented for C
 
 MF
 Java Separate
+; Documented for C
 
 MM
 Java
+; Documented for C
 
 MMD_
 Java
+; Documented for C
 
 MP
 Java
+; Documented for C
 
 MT
 Java Separate
+; Documented for C
 
 Wall
 Java
+; Documented for C
 
 Wdeprecated
 Java
+Warn if deprecated class, method, or field is used
 
 Wextraneous-semicolon
 Java
+Warn if deprecated empty statements are found
 
 Wout-of-date
 Java
+Warn if .class files are out of date
 
 Wredundant-modifiers
 Java
+Warn if modifiers are specified when not necessary
 
 fCLASSPATH=
 Java JoinedOrMissing RejectNegative
+--CLASSPATH	Deprecated; use --classpath instead
 
 fassert
 Java
@@ -78,12 +92,14 @@ Java JoinedOrMissing
 
 fbootclasspath=
 Java JoinedOrMissing RejectNegative
+--bootclasspath=<path>	Replace system path
 
 fcheck-references
 Java
 
 fclasspath=
 Java JoinedOrMissing RejectNegative
+--classpath=<path>	Set class path
 
 fcompile-resource=
 Java Joined RejectNegative
@@ -99,6 +115,7 @@ Java
 
 fencoding=
 Java Joined RejectNegative
+--encoding=<encoding>	Choose input encoding (defaults from your locale)
 
 fextdirs=
 Java Joined RejectNegative
@@ -108,27 +125,32 @@ Java
 
 fforce-classes-archive-check
 Java
+Always check for non gcj generated classes archives
 
 fhash-synchronization
 Java
 
 findirect-dispatch
 Java
+Use offset tables for virtual method calls
 
 finline-functions
 Java
 
 fjni
 Java
+Assume native functions are implemented using JNI
 
 foptimize-static-class-initialization
 Java
+Enable optimization of static class initialization code
 
 foutput-class-dir=
 Java Joined RejectNegative
 
 fstore-check
 Java
+Enable assignability checks for stores into object arrays
 
 fuse-boehm-gc
 Java