* invoke.texi: Document that -fcond-mismatch isn't supported for

	C++.

cp:
	* cp-tree.h (flag_cond_mismatch): Don't declare.
	* decl2.c (flag_cond_mismatch): Don't define.
	(lang_f_options): Remove cond-mismatch.
	(unsupported_options): Add cond-mismatch.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f1a4b98..b0c0eac 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2001-01-10  Joseph S. Myers  <jsm28@cam.ac.uk>
 
+       * invoke.texi: Document that -fcond-mismatch isn't supported for
+       C++.
+
+2001-01-10  Joseph S. Myers  <jsm28@cam.ac.uk>
+
        * gcc.texi: Define macro gcctabopt.
        * invoke.texi: Add manpage sections BUGS and AUTHOR.  Use
        @command, @env and @option in some places where appropriate.  Use

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fe4ee20..173e222 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-10  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+       * cp-tree.h (flag_cond_mismatch): Don't declare.
+       * decl2.c (flag_cond_mismatch): Don't define.
+       (lang_f_options): Remove cond-mismatch.
+       (unsupported_options): Add cond-mismatch.
+
 2001-01-09  Nathan Sidwell  <nathan@codesourcery.com>
 
        * class.c (handle_using_decl): Reject using of constructor name

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index d0664b1..d0784e8 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -990,11 +990,6 @@ extern tree global_namespace;
 
 extern int dollars_in_ident;
 
-/* Nonzero means allow type mismatches in conditional expressions;
-   just make their values `void'.   */
-
-extern int flag_cond_mismatch;
-
 /* Nonzero means don't recognize the keyword `asm'.  */
 
 extern int flag_no_asm;

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index f051a45..4da673b 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -139,11 +139,6 @@ static tree decl_namespace_list;
 \f
 /* C (and C++) language-specific option variables.  */
 
-/* Nonzero means allow type mismatches in conditional expressions;
-   just make their values `void'.   */
-
-int flag_cond_mismatch;
-
 /* Nonzero means don't recognize the keyword `asm'.  */
 
 int flag_no_asm;
@@ -492,7 +487,6 @@ lang_f_options[] =
   {"short-enums", &flag_short_enums, 1},
   {"short-double", &flag_short_double, 1},
   {"short-wchar", &flag_short_wchar, 1},
-  {"cond-mismatch", &flag_cond_mismatch, 1},
   {"asm", &flag_no_asm, 0},
   {"builtin", &flag_no_builtin, 0},
 
@@ -536,6 +530,7 @@ lang_f_options[] =
    listed here.  This table must be kept in alphabetical order.  */
 static const char * const unsupported_options[] = {
   "all-virtual",
+  "cond-mismatch",
   "enum-int-equiv",
   "guiding-decls",
   "nonnull-objects",

diff --git a/gcc/invoke.texi b/gcc/invoke.texi
index 753de4a..3d3caff 100644 (file)
--- a/gcc/invoke.texi
+++ b/gcc/invoke.texi
@@ -1071,7 +1071,8 @@ string constants can contain the newline character as typed.)
 
 @item -fcond-mismatch
 Allow conditional expressions with mismatched types in the second and
-third arguments.  The value of such an expression is void.
+third arguments.  The value of such an expression is void.  This option
+is not supported for C++.
 
 @item -funsigned-char
 Let the type @code{char} be unsigned, like @code{unsigned char}.