* c.opt: Document Uncodumented; use it. Document ObjC options.

	* opts.c (print_filtered_help): Skip undocumented switches.
	* opts.h (CL_UNDOCUMENTED): New.
	* opts.sh: Handle Undocumented.
	* toplev.c (documented_lang_options): Prevent its becoming empty.
f:
	* lang-options.h: Remove.
	* lang.opt: Document most options.
objc:
	* lang-options.h: Remove.


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

10 files changed, 123 insertions, 288 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fc5e9674fc2..cbc6bc0eecd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2003-07-17  Neil Booth  <neil@daikokuya.co.uk>
+
+	* c.opt: Document Uncodumented; use it.  Document ObjC options.
+	* opts.c (print_filtered_help): Skip undocumented switches.
+	* opts.h (CL_UNDOCUMENTED): New.
+	* opts.sh: Handle Undocumented.
+	* toplev.c (documented_lang_options): Prevent its becoming empty.
+objc:
+	* lang-options.h: Remove.
+
 2003-07-16  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* loop.c (check_ext_dependent_givs): Pass const struct loop *
diff --git a/gcc/c.opt b/gcc/c.opt
index 097775823b5..042f4cfc86d 100644
--- a/gcc/c.opt
+++ b/gcc/c.opt
@@ -44,7 +44,11 @@
 ; output.  However, if the help text contains a tab character, the
 ; text to the left of the tab is output instead of the switch, and the
 ; text to its right forms the help.  This is useful for elaborating on
-; what type of argument a switch takes, for example.
+; what type of argument a switch takes, for example.  If the second
+; field contains "Undocumented" then nothing is output with --help.
+; Only do this with good reason like the switch being internal between
+; the driver and the front end - it is not an excuse to leave a switch
+; undocumented.
 
 ; Comments can appear on their own line anwhere in the file, preceded
 ; by a semicolon.  Whitespace is permitted before the semicolon.
@@ -87,7 +91,7 @@ C ObjC C++ ObjC++ Joined Separate
 -D<macro>[=<val>]	Define a <macro> with <val> as its value.  If just <macro> is given, <val> is taken to be 1
 
 E
-C ObjC C++ ObjC++
+C ObjC C++ ObjC++ Undocumented
 
 H
 C ObjC C++ ObjC++
@@ -318,6 +322,7 @@ Warn about function pointer arithmetic
 
 Wprotocol
 ObjC ObjC++
+Warn if inherited methods are unimplemented
 
 Wredundant-decls
 C ObjC C++ ObjC++
@@ -333,6 +338,7 @@ Warn whenever a function's return type defaults to \"int\" (C), or about inconsi
 
 Wselector
 ObjC ObjC++
+Warn if a selector has multiple methods
 
 Wsequence-point
 C ObjC
@@ -436,6 +442,7 @@ Make string literals \"const char[]\" not \"char[]\"
 
 fconstant-string-class=
 ObjC ObjC++ Joined
+-fconst-string-class=<name>	Use class <name> for constant strings
 
 fdefault-inline
 C++ ObjC++
@@ -486,6 +493,7 @@ Recognize GNU-defined keywords
 
 fgnu-runtime
 ObjC ObjC++
+Generate code for GNU runtime environment
 
 fguiding-decls
 C++ ObjC++
@@ -531,6 +539,7 @@ C++ ObjC++
 
 fnext-runtime
 ObjC ObjC++
+Generate code for NeXT runtime environment
 
 fnonansi-builtins
 C++ ObjC++
@@ -643,6 +652,7 @@ Emit cross referencing information
 
 gen-decls
 ObjC ObjC++
+Dump declarations to a .decl file
 
 idirafter
 C ObjC C++ ObjC++ Joined Separate
@@ -677,12 +687,10 @@ C ObjC C++ ObjC++ Joined Separate
 -iwithprefixbefore <dir>	Add <dir> to the end of the main include path
 
 lang-asm
-C
-For internal use only
+C Undocumented
 
 lang-objc
-C ObjC C++ ObjC++
-For internal use only
+C ObjC C++ ObjC++ Undocumented
 
 nostdinc
 C ObjC C++ ObjC++
@@ -706,6 +714,7 @@ C ObjC C++ ObjC++
 
 print-objc-runtime-info
 ObjC ObjC++
+Generate C header of platform-specific features
 
 remap
 C ObjC C++ ObjC++
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 9c76ecfdc8e..5ca6035432d 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 17 06:34:41 2003  Neil Booth  <neil@daikokuya.co.uk>
+
+	* lang-options.h: Remove.
+	* lang.opt: Document most options.
+
 2003-07-14  Geoffrey Keating  <geoffk@apple.com>
 
 	* lang-specs.h (f77-cpp-input): Use -o to specify the CPP output file.
diff --git a/gcc/f/lang-options.h b/gcc/f/lang-options.h
deleted file mode 100644
index b2821ed936f..00000000000
--- a/gcc/f/lang-options.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/* lang-options.h file for Fortran
-   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-   Contributed by James Craig Burley.
-
-This file is part of GNU Fortran.
-
-GNU Fortran 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.
-
-GNU Fortran 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 GNU Fortran; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-
-*/
-
-/* This is the contribution to the `documented_lang_options' array in
-   toplev.c for g77.  */
-
-#ifdef __STDC__	/* To be consistent with lang-specs.h.  Maybe avoid
-		   overflowing some old compiler's tables, etc. */
-
-DEFINE_LANG_NAME ("Fortran")
-
-  { "-fversion", 
-    N_("Print g77-specific compiler version info, run internal tests") },
-/*"-fident",*/
-/*"-fno-ident",*/
-  { "-ff66", 
-    N_("Program is written in typical FORTRAN 66 dialect") },
-  { "-fno-f66", "" },
-  { "-ff77", 
-    N_("Program is written in typical Unix f77 dialect") },
-  { "-fno-f77", 
-    N_("Program does not use Unix-f77 dialectal features") },
-  { "-ff90", 
-    N_("Program is written in Fortran-90-ish dialect") },
-  { "-fno-f90", "" },
-  { "-fautomatic", "" },
-  { "-fno-automatic", 
-    N_("Treat local vars and COMMON blocks as if they were named in SAVE statements") },
-  { "-fdollar-ok", 
-    N_("Allow $ in symbol names") },
-  { "-fno-dollar-ok", "" },
-  { "-ff2c", "" },
-  { "-fno-f2c", 
-    N_("f2c-compatible code need not be generated") },
-  { "-ff2c-library", "" },
-  { "-fno-f2c-library", 
-    N_("Unsupported; do not generate libf2c-calling code") },
-  { "-fflatten-arrays", 
-    N_("Unsupported; affects code-generation of arrays") },
-  { "-fno-flatten-arrays", "" },
-  { "-ffree-form", 
-    N_("Program is written in Fortran-90-ish free form") },
-  { "-fno-free-form", "" },
-  { "-ffixed-form", "" },
-  { "-fno-fixed-form", "" },
-  { "-fpedantic", 
-    N_("Warn about use of (only a few for now) Fortran extensions") },
-  { "-fno-pedantic", "" },
-  { "-fvxt", 
-    N_("Program is written in VXT (Digital-like) FORTRAN") },
-  { "-fno-vxt", "" },
-  { "-fno-ugly", 
-    N_("Disallow all ugly features") },
-  { "-fugly-args", "" },
-  { "-fno-ugly-args", 
-    N_("Hollerith and typeless constants not passed as arguments") },
-  { "-fugly-assign", 
-    N_("Allow ordinary copying of ASSIGN'ed vars") },
-  { "-fno-ugly-assign", "" },
-  { "-fugly-assumed", 
-    N_("Dummy array dimensioned to (1) is assumed-size") },
-  { "-fno-ugly-assumed", "" },
-  { "-fugly-comma", 
-    N_("Trailing comma in procedure call denotes null argument") },
-  { "-fno-ugly-comma", "" },
-  { "-fugly-complex", 
-    N_("Allow REAL(Z) and AIMAG(Z) given DOUBLE COMPLEX Z") },
-  { "-fno-ugly-complex", "" },
-  { "-fugly-init", "" },
-  { "-fno-ugly-init", 
-    N_("Initialization via DATA and PARAMETER is type-compatible") },
-  { "-fugly-logint", 
-    N_("Allow INTEGER and LOGICAL interchangeability") },
-  { "-fno-ugly-logint", "" },
-  { "-fxyzzy", 
-    N_("Print internal debugging-related info") },
-  { "-fno-xyzzy", "" },
-  { "-finit-local-zero", 
-    N_("Initialize local vars and arrays to zero") },
-  { "-fno-init-local-zero", "" },
-  { "-fbackslash", "" },
-  { "-fno-backslash", 
-    N_("Backslashes in character/hollerith constants not special (C-style)") },
-  { "-femulate-complex", 
-    N_("Have front end emulate COMPLEX arithmetic to avoid bugs") },
-  { "-fno-emulate-complex", "" },
-  { "-funderscoring", "" },
-  { "-fno-underscoring", 
-    N_("Disable the appending of underscores to externals") },
-  { "-fsecond-underscore", "" },
-  { "-fno-second-underscore", 
-    N_("Never append a second underscore to externals") },
-  { "-fintrin-case-initcap", 
-    N_("Intrinsics spelled as e.g. SqRt") },
-  { "-fintrin-case-upper", 
-    N_("Intrinsics in uppercase") },
-  { "-fintrin-case-lower", "" },
-  { "-fintrin-case-any", 
-    N_("Intrinsics letters in arbitrary cases") },
-  { "-fmatch-case-initcap", 
-    N_("Language keywords spelled as e.g. IOStat") },
-  { "-fmatch-case-upper", 
-    N_("Language keywords in uppercase") },
-  { "-fmatch-case-lower", "" },
-  { "-fmatch-case-any", 
-    N_("Language keyword letters in arbitrary cases") },
-  { "-fsource-case-upper", 
-    N_("Internally convert most source to uppercase") },
-  { "-fsource-case-lower", "" },
-  { "-fsource-case-preserve", 
-    N_("Internally preserve source case") },
-  { "-fsymbol-case-initcap", 
-    N_("Symbol names spelled in mixed case") },
-  { "-fsymbol-case-upper", 
-    N_("Symbol names in uppercase") },
-  { "-fsymbol-case-lower", 
-    N_("Symbol names in lowercase") },
-  { "-fsymbol-case-any", "" },
-  { "-fcase-strict-upper", 
-    N_("Program written in uppercase") },
-  { "-fcase-strict-lower", 
-    N_("Program written in lowercase") },
-  { "-fcase-initcap", 
-    N_("Program written in strict mixed-case") },
-  { "-fcase-upper", 
-    N_("Compile as if program written in uppercase") },
-  { "-fcase-lower", 
-    N_("Compile as if program written in lowercase") },
-  { "-fcase-preserve", 
-    N_("Preserve all spelling (case) used in program") },
-  { "-fbadu77-intrinsics-delete", 
-    N_("Delete libU77 intrinsics with bad interfaces") },
-  { "-fbadu77-intrinsics-disable", 
-    N_("Disable libU77 intrinsics with bad interfaces") },
-  { "-fbadu77-intrinsics-enable", "" },
-  { "-fbadu77-intrinsics-hide", 
-    N_("Hide libU77 intrinsics with bad interfaces") },
-  { "-ff2c-intrinsics-delete", 
-    N_("Delete non-FORTRAN-77 intrinsics f2c supports") },
-  { "-ff2c-intrinsics-disable", 
-    N_("Disable non-FORTRAN-77 intrinsics f2c supports") },
-  { "-ff2c-intrinsics-enable", "" },
-  { "-ff2c-intrinsics-hide", 
-    N_("Hide non-FORTRAN-77 intrinsics f2c supports") },
-  { "-ff90-intrinsics-delete", 
-    N_("Delete non-FORTRAN-77 intrinsics F90 supports") },
-  { "-ff90-intrinsics-disable", 
-    N_("Disable non-FORTRAN-77 intrinsics F90 supports") },
-  { "-ff90-intrinsics-enable", "" },
-  { "-ff90-intrinsics-hide", 
-    N_("Hide non-FORTRAN-77 intrinsics F90 supports") },
-  { "-fgnu-intrinsics-delete", 
-    N_("Delete non-FORTRAN-77 intrinsics g77 supports") },
-  { "-fgnu-intrinsics-disable", 
-    N_("Disable non-FORTRAN 77 intrinsics F90 supports") },
-  { "-fgnu-intrinsics-enable", "" },
-  { "-fgnu-intrinsics-hide", 
-    N_("Hide non-FORTRAN 77 intrinsics F90 supports") },
-  { "-fmil-intrinsics-delete", 
-    N_("Delete MIL-STD 1753 intrinsics") },
-  { "-fmil-intrinsics-disable", 
-    N_("Disable MIL-STD 1753 intrinsics") },
-  { "-fmil-intrinsics-enable", "" },
-  { "-fmil-intrinsics-hide", 
-    N_("Hide MIL-STD 1753 intrinsics") },
-  { "-funix-intrinsics-delete", 
-    N_("Delete libU77 intrinsics") },
-  { "-funix-intrinsics-disable", 
-    N_("Disable libU77 intrinsics") },
-  { "-funix-intrinsics-enable", "" },
-  { "-funix-intrinsics-hide", 
-    N_("Hide libU77 intrinsics") },
-  { "-fvxt-intrinsics-delete", 
-    N_("Delete non-FORTRAN-77 intrinsics VXT FORTRAN supports") },
-  { "-fvxt-intrinsics-disable", 
-    N_("Disable non-FORTRAN-77 intrinsics VXT FORTRAN supports") },
-  { "-fvxt-intrinsics-enable", "" },
-  { "-fvxt-intrinsics-hide", 
-    N_("Hide non-FORTRAN-77 intrinsics VXT FORTRAN supports") },
-  { "-fzeros", 
-    N_("Treat initial values of 0 like non-zero values") },
-  { "-fno-zeros", "" },
-  { "-fdebug-kludge", 
-    N_("Emit special debugging information for COMMON and EQUIVALENCE (disabled)") },
-  { "-fno-debug-kludge", "" },
-  { "-fonetrip", 
-    N_("Take at least one trip through each iterative DO loop") },
-  { "-fno-onetrip", "" },
-  { "-fsilent", "" },
-  { "-fno-silent", 
-    N_("Print names of program units as they are compiled") },
-  { "-fglobals", "" },
-  { "-fno-globals", 
-    N_("Disable fatal diagnostics about inter-procedural problems") },
-  { "-ftypeless-boz", 
-    N_("Make prefix-radix non-decimal constants be typeless") },
-  { "-fno-typeless-boz", "" },
-  { "-fbounds-check", 
-    N_("Generate code to check subscript and substring bounds") },
-  { "-fno-bounds-check", "" },
-  { "-ffortran-bounds-check",
-    N_("Fortran-specific form of -fbounds-check") },
-  { "-fno-fortran-bounds-check", "" },
-  { "-Wglobals", "" },
-  { "-Wno-globals", 
-    N_("Disable warnings about inter-procedural problems") },
-/*"-Wimplicit",*/
-/*"-Wno-implicit",*/
-  { "-Wsurprising", 
-    N_("Warn about constructs with surprising meanings") },
-  { "-Wno-surprising", "" },
-/*"-Wall",*/
-/* Prefix options.  */
-  { "-I", 
-    N_("Add a directory for INCLUDE searching") },
-  { "-ffixed-line-length-", 
-    N_("Set the maximum line length") },
-
-#endif
diff --git a/gcc/f/lang.opt b/gcc/f/lang.opt
index d53a0f50039..d6a53b7dcd1 100644
--- a/gcc/f/lang.opt
+++ b/gcc/f/lang.opt
@@ -27,9 +27,11 @@ F77
 
 I
 F77 Joined
+Add a directory for INCLUDE searching
 
 Wall
 F77
+; Documented in C
 
 Wcomment
 F77
@@ -39,6 +41,7 @@ F77
 
 Wglobals
 F77
+Enable warnings about inter-procedural problems
 
 Wimplicit
 F77
@@ -48,93 +51,122 @@ F77
 
 Wsurprising
 F77
+Warn about constructs with surprising meanings
 
 Wtrigraphs
 F77
 
 fautomatic
 F77
+Do not treat local variables and COMMON blocks as if they were named in SAVE statements
 
 fbackslash
 F77
+Backslashes in character and hollerith constants are special (not C-style)
 
 fbadu77-intrinsics-delete
 F77 RejectNegative
+Delete libU77 intrinsics with bad interfaces
 
 fbadu77-intrinsics-disable
 F77 RejectNegative
+Disable libU77 intrinsics with bad interfaces
 
 fbadu77-intrinsics-enable
 F77 RejectNegative
+Enable libU77 intrinsics with bad interfaces
 
 fbadu77-intrinsics-hide
 F77 RejectNegative
+Hide libU77 intrinsics with bad interfaces
 
 fcase-initcap
 F77 RejectNegative
+Program written in strict mixed-case
 
 fcase-lower
 F77 RejectNegative
+Compile as if program written in lowercase
 
 fcase-preserve
 F77 RejectNegative
+Preserve case used in program
 
 fcase-strict-lower
 F77 RejectNegative
+Program written in lowercase
 
 fcase-strict-upper
 F77 RejectNegative
+Program written in uppercase
 
 fcase-upper
 F77 RejectNegative
+Compile as if program written in uppercase
 
 fdebug-kludge
 F77
+Emit special debugging information for COMMON and EQUIVALENCE (disabled)
 
 fdollar-ok
 F77
+Allow '$' in symbol names
 
 femulate-complex
 F77
+Have front end emulate COMPLEX arithmetic to avoid bugs
 
 ff2c
 F77
+f2c-compatible code can be generated
 
 ff2c-intrinsics-delete
 F77 RejectNegative
+Delete non-FORTRAN-77 intrinsics f2c supports
 
 ff2c-intrinsics-disable
 F77 RejectNegative
+Disable non-FORTRAN-77 intrinsics f2c supports
 
 ff2c-intrinsics-enable
 F77 RejectNegative
+Enable non-FORTRAN-77 intrinsics f2c supports
 
 ff2c-intrinsics-hide
 F77 RejectNegative
+Hide non-FORTRAN-77 intrinsics f2c supports
 
 ff2c-library
 F77
+Unsupported; generate libf2c-calling code
 
 ff66
 F77
+Program is written in typical FORTRAN 66 dialect
 
 ff77
 F77
+Program is written in typical Unix-f77 dialect
 
 ff90
 F77
+Program is written in Fortran-90-ish dialect
 
 ff90-intrinsics-delete
 F77 RejectNegative
+Delete non-FORTRAN-77 intrinsics F90 supports
 
 ff90-intrinsics-disable
 F77 RejectNegative
+Disable non-FORTRAN-77 intrinsics F90 supports
 
 ff90-intrinsics-enable
 F77 RejectNegative
+Enable non-FORTRAN-77 intrinsics F90 supports
 
 ff90-intrinsics-hide
 F77 RejectNegative
+Hide non-FORTRAN-77 intrinsics F90 supports
 
 ff90-not-vxt
 F77 RejectNegative
@@ -144,173 +176,227 @@ F77
 
 ffixed-line-length-
 F77 Joined
+ffixed-line-length-<number>	Set the maximum line length to <number>
 
 fflatten-arrays
 F77
+Unsupported; affects code generation of arrays
 
 ffortran-bounds-check
 F77
+Generate code to check subscript and substring bounds
 
 ffree-form
 F77
+Program is written in Fortran-90-ish free form
 
 fglobals
 F77
+Enable fatal diagnostics about inter-procedural problems
 
 fgnu-intrinsics-delete
 F77 RejectNegative
+Delete non-FORTRAN-77 intrinsics g77 supports
 
 fgnu-intrinsics-disable
 F77 RejectNegative
+Disable non-FORTRAN 77 intrinsics F90 supports
 
 fgnu-intrinsics-enable
 F77 RejectNegative
+Enable non-FORTRAN 77 intrinsics F90 supports
 
 fgnu-intrinsics-hide
 F77 RejectNegative
+Hide non-FORTRAN 77 intrinsics F90 supports
 
 finit-local-zero
 F77
+Initialize local vars and arrays to zero
 
 fintrin-case-any
 F77 RejectNegative
+Intrinsics letters in arbitrary cases
 
 fintrin-case-initcap
 F77 RejectNegative
+Intrinsics spelled as e.g. SqRt
 
 fintrin-case-lower
 F77 RejectNegative
+Intrinsics in lowercase
 
 fintrin-case-upper
 F77 RejectNegative
+Intrinsics in uppercase
 
 fmatch-case-any
 F77 RejectNegative
+Language keyword letters in arbitrary cases
 
 fmatch-case-initcap
 F77 RejectNegative
+Language keywords spelled as e.g. IOStat
 
 fmatch-case-lower
 F77 RejectNegative
+Language keywords in lowercase
 
 fmatch-case-upper
 F77 RejectNegative
+Language keywords in uppercase
 
 fmil-intrinsics-delete
 F77 RejectNegative
+Delete MIL-STD 1753 intrinsics
 
 fmil-intrinsics-disable
 F77 RejectNegative
+Disable MIL-STD 1753 intrinsics
 
 fmil-intrinsics-enable
 F77 RejectNegative
+Enable MIL-STD 1753 intrinsics
 
 fmil-intrinsics-hide
 F77 RejectNegative
+Hide MIL-STD 1753 intrinsics
 
 fonetrip
 F77
+Take at least one trip through each iterative DO loop
 
 fpedantic
 F77
+Warn about use of (only a few for now) Fortran extensions
 
 fpreprocessed
 F77
 
 fsecond-underscore
 F77
+Allow appending a second underscore to externals
 
 fsilent
 F77
+Do not print names of program units as they are compiled
 
 fsource-case-lower
 F77 RejectNegative
+Internally convert most source to lowercase
 
 fsource-case-preserve
 F77 RejectNegative
+Internally preserve source case
 
 fsource-case-upper
 F77 RejectNegative
+Internally convert most source to uppercase
 
 fsymbol-case-any
 F77 RejectNegative
 
 fsymbol-case-initcap
 F77 RejectNegative
+Symbol names spelled in mixed case
 
 fsymbol-case-lower
 F77 RejectNegative
+Symbol names in lowercase
 
 fsymbol-case-upper
 F77 RejectNegative
+Symbol names in uppercase
 
 ftypeless-boz
 F77
+Make prefix-radix non-decimal constants be typeless
 
 fugly
 F77
+Allow all ugly features
 
 fugly-args
 F77
+Hollerith and typeless can be passed as arguments
 
 fugly-assign
 F77
+Allow ordinary copying of ASSIGN'ed vars
 
 fugly-assumed
 F77
+Dummy array dimensioned to (1) is assumed-size
 
 fugly-comma
 F77
+Trailing comma in procedure call denotes null argument
 
 fugly-complex
 F77
+Allow REAL(Z) and AIMAG(Z) given DOUBLE COMPLEX Z
 
 fugly-init
 F77
+Initialization via DATA and PARAMETER is not type-compatible
 
 fugly-logint
 F77
+Allow INTEGER and LOGICAL interchangeability
 
 funderscoring
 F77
+Append underscores to externals
 
 funix-intrinsics-delete
 F77 RejectNegative
+Delete libU77 intrinsics
 
 funix-intrinsics-disable
 F77 RejectNegative
+Disable libU77 intrinsics
 
 funix-intrinsics-enable
 F77 RejectNegative
+Enable libU77 intrinsics
 
 funix-intrinsics-hide
 F77 RejectNegative
+Hide libU77 intrinsics
 
 fversion
 F77 RejectNegative
+Print g77-specific version information and run internal tests
 
 fvxt
 F77
+Program is written in VXT (Digital-like) FORTRAN
 
 fvxt-intrinsics-delete
 F77 RejectNegative
+Delete non-FORTRAN-77 intrinsics VXT FORTRAN supports
 
 fvxt-intrinsics-disable
 F77 RejectNegative
+Disable non-FORTRAN-77 intrinsics VXT FORTRAN supports
 
 fvxt-intrinsics-enable
 F77 RejectNegative
+Enable non-FORTRAN-77 intrinsics VXT FORTRAN supports
 
 fvxt-intrinsics-hide
 F77 RejectNegative
+Hide non-FORTRAN-77 intrinsics VXT FORTRAN supports
 
 fvxt-not-f90
 F77 RejectNegative
 
 fxyzzy
 F77
+Print internal debugging-related information
 
 fzeros
 F77
+Treat initial values of 0 like non-zero values
 
 ; This comment is to ensure we retain the blank line above.
diff --git a/gcc/objc/lang-options.h b/gcc/objc/lang-options.h
deleted file mode 100644
index c99529cf21c..00000000000
--- a/gcc/objc/lang-options.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Switch definitions for the GNU compiler for the Objective-C language.
-   Copyright (C) 2000, 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.  */
-
-/* This is the contribution to the `documented_lang_options' array in
-   toplev.c for Objective-C.  */
-
-DEFINE_LANG_NAME ("Objective C")
-  
-  { "-gen-decls", 
-    N_("Dump decls to a .decl file") },
-  { "-fgnu-runtime", 
-    N_("Generate code for GNU runtime environment") },
-  { "-fno-gnu-runtime", "" },
-  { "-fnext-runtime", 
-    N_("Generate code for NeXT runtime environment") },
-  { "-fno-next-runtime", "" },
-  { "-Wselector", 
-    N_("Warn if a selector has multiple methods") },
-  { "-Wno-selector", "" },
-  { "-Wprotocol", "" },
-  { "-Wno-protocol", 
-    N_("Do not warn if inherited methods are unimplemented") },
-  { "-print-objc-runtime-info",
-    N_("Generate C header of platform specific features") },
-  { "-fconstant-string-class",
-    N_("Specify the name of the class for constant strings") },
diff --git a/gcc/opts.c b/gcc/opts.c
index 7a203dcc2ec..6e966633f20 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -1523,6 +1523,10 @@ print_filtered_help (unsigned int flag)
       if ((cl_options[i].flags & filter) != flag)
 	continue;
 
+      /* Skip help for internal switches.  */
+      if (cl_options[i].flags & CL_UNDOCUMENTED)
+	continue;
+
       /* During transition, ignore switches with no help.  */
       help = cl_options[i].help;
       if (!help)
diff --git a/gcc/opts.h b/gcc/opts.h
index cffeeba98cc..0848054e567 100644
--- a/gcc/opts.h
+++ b/gcc/opts.h
@@ -42,5 +42,6 @@ extern const char *const lang_names[];
 #define CL_MISSING_OK		(1 << 27) /* Missing argument OK (joined).  */
 #define CL_UINTEGER		(1 << 28) /* Argument is an integer >=0.  */
 #define CL_COMMON		(1 << 29) /* Language-independent.  */
+#define CL_UNDOCUMENTED		(1 << 30) /* Do not output with --help.  */
 
 #endif
diff --git a/gcc/opts.sh b/gcc/opts.sh
index 3509dfdafef..13cd4c4fccc 100644
--- a/gcc/opts.sh
+++ b/gcc/opts.sh
@@ -65,6 +65,7 @@ ${AWK} '
         if (flags ~ " Separate ") result = result " | CL_SEPARATE"
         if (flags ~ " RejectNegative ") result = result " | CL_REJECT_NEGATIVE"
         if (flags ~ " UInteger ") result = result " | CL_UINTEGER"
+        if (flags ~ " Undocumented ") result = result " | CL_UNDOCUMENTED"
 	sub( "^0 \\| ", "", result )
 	return result
     }
diff --git a/gcc/toplev.c b/gcc/toplev.c
index ab42dfa926d..4e34bc150d3 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1192,6 +1192,7 @@ documented_lang_options[] =
 
 #include "options_.h"
 
+  { NULL, "Dummy" }
 };
 
 /* Here is a table, controlled by the tm.h file, listing each -m switch