[PATCH, java, fortran] Merge help texts for duplicate options.

[Ralf Wildenhues <Ralf dot Wildenhues at gmx dot de>]

Hello,

Currently, some switches are documented more than once.  The opt*.awk
machinery currently picks one arbitrarily, for -v --help output (see
the other patch on gcc-patches that ensures that at least one of them
is picked).

This patch attempts to sort out the duplicates manually.  I found this
a bit nontrivial to do, as for other languages, the help may sound
confusing or may not even be true, so please read carefully.

Changes address Fortran, C, and Java front-ends.

These are the current duplicates found on i686-pc-linux-gnu:

I:
c:       -I <dir>        Add <dir> to the end of the main include path
fortran: -I<directory>   Add a directory for INCLUDE and MODULE searching

Wconversion:
c:       Warn for implicit type conversions that may change a value
fortran: Warn about implicit conversion

Wdeprecated:
c:       Warn about deprecated compiler features
java:    Warn if a deprecated compiler feature, class, method, or field is used

Wsystem-headers:
common:  Do not suppress warnings from system headers
c:       Do not suppress warnings from system headers

d:
common:  -d<letters>     Enable dumps from specific passes of the compiler
fortran: -d[DIMNU]       Dump details about macro names and definitions during preprocessing

fopenmp:
c:       Enable OpenMP
fortran: Enable OpenMP (also sets frecursive)

fpreprocessed:
c:       Treat the input file as already preprocessed
fortran: Treat the input file as preprocessed

fshort-enums:
c:       Use the narrowest integer type possible for enumeration types
fortran: Use the narrowest integer type possible for enumeration types


OK for 4.5?
What about 4.4 (asking because this is more of a doc patch)?
bootregged i686-pc-linux-gnu (like all the other patches).

Thanks,
Ralf

gcc/ChangeLog:
2009-03-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* c.opt: Unify help texts for -Wdeprecated, -Wsystem-headers,
	and -fopenmp.

gcc/fortran/ChangeLog:
2009-03-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* lang.opt: Unify help texts for -I, -Wconversion, -d, -fopenmp,
	and -fpreprocessed.

gcc/java/ChangeLog:
2009-03-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* lang.opt: Unify help text for -Wdeprecated.

diff --git a/gcc/c.opt b/gcc/c.opt
index 5f07aea..40681bd 100644
--- a/gcc/c.opt
+++ b/gcc/c.opt
@@ -185,7 +185,7 @@ Warn when a declaration is found after a statement
 
 Wdeprecated
 C C++ ObjC ObjC++ Var(warn_deprecated) Init(1) Warning
-Warn about deprecated compiler features
+Warn if a deprecated compiler feature, class, method, or field is used
 
 Wdiv-by-zero
 C ObjC C++ ObjC++ Var(warn_div_by_zero) Init(1) Warning
@@ -446,7 +446,7 @@ Deprecated.  This switch has no effect
 
 Wsystem-headers
 C ObjC C++ ObjC++ Warning
-Do not suppress warnings from system headers
+; Documented in common.opt
 
 Wtraditional
 C ObjC Var(warn_traditional) Warning
@@ -691,7 +691,7 @@ Enable Objective-C setjmp exception handling runtime
 
 fopenmp
 C ObjC C++ ObjC++ Var(flag_openmp)
-Enable OpenMP
+Enable OpenMP (implies -frecursive in Fortran)
 
 foperator-names
 C++ ObjC++
diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
index e49ff76..64fd486 100644
--- a/gcc/fortran/lang.opt
+++ b/gcc/fortran/lang.opt
@@ -1,5 +1,5 @@
 ; Options for the Fortran 95 front end.
-; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
+; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
 ; Free Software Foundation, Inc.
 ;
 ; This file is part of GCC.
@@ -50,7 +50,7 @@ Fortran
 
 I
 Fortran Joined Separate
--I<directory>	Add a directory for INCLUDE and MODULE searching
+; Documented in C
 
 J
 Fortran Joined Separate
@@ -90,7 +90,7 @@ Warn about truncated character expressions
 
 Wconversion
 Fortran Warning
-Warn about implicit conversion
+; Documented in C
 
 Wimplicit-interface
 Fortran Warning
@@ -134,7 +134,7 @@ Disable preprocessing
 
 d
 Fortran Joined
--d[DIMNU]	Dump details about macro names and definitions during preprocessing
+; Documented in common.opt
 
 falign-commons
 Fortran
@@ -310,7 +310,7 @@ Set default accessibility of module entities to PRIVATE.
 
 fopenmp
 Fortran
-Enable OpenMP (also sets frecursive)
+; Documented in C
 
 fpack-derived
 Fortran
@@ -318,7 +318,7 @@ Try to lay out derived types as compactly as possible
 
 fpreprocessed
 Fortran
-Treat the input file as preprocessed
+; Documented in C
 
 frange-check
 Fortran
diff --git a/gcc/java/lang.opt b/gcc/java/lang.opt
index 7947a1a..8af1bd5 100644
--- a/gcc/java/lang.opt
+++ b/gcc/java/lang.opt
@@ -1,5 +1,5 @@
 ; Options for the Java front end.
-; Copyright (C) 2003, 2005, 2007 Free Software Foundation, Inc.
+; Copyright (C) 2003, 2005, 2007, 2009 Free Software Foundation, Inc.
 ;
 ; This file is part of GCC.
 ;
@@ -62,7 +62,7 @@ Java
 
 Wdeprecated
 Java Var(warn_deprecated) VarExists
-Warn if a deprecated compiler feature, class, method, or field is used
+; Documented for C
 
 Wextraneous-semicolon
 Java Var(flag_extraneous_semicolon)