diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a7a4cc8d2f7e1b68b3f9c41a36437cdfc54f3808..80428d4494cca3677b6ff2e1e20c647f23deca4c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2000-08-02  Zack Weinberg  <zack@wolery.cumb.org>
 
+	* decl2.c: Silently ignore -Wstrict-prototypes; warn about
+	-Wno-strict-prototypes.
+
 	* g++spec.c: Adjust type of second argument to
 	lang_specific_driver, and update code as necessary.
 
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 1211957391e5c246baa16ba4d6c722381b85ab4e..690a78de6cf11ddca778c0bd56442c53db45ca4d 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -737,6 +737,11 @@ lang_decode_option (argc, argv)
 	warn_pointer_arith = setting;
       else if (!strcmp (p, "missing-prototypes"))
 	warn_missing_prototypes = setting;
+      else if (!strcmp (p, "strict-prototypes"))
+	{
+	  if (setting == 0)
+	    warning ("-Wno-strict-prototypes is not supported in C++");
+	}
       else if (!strcmp (p, "redundant-decls"))
 	warn_redundant_decls = setting;
       else if (!strcmp (p, "missing-braces"))