Cygnus<-->FSF merge

From-SVN: r3303

gcc/dbxout.c

@@ -726,7 +726,10 @@ dbxout_type_methods (type)
 	if (!warned)
 	  {
 	    warned = 1;
-	    warning ("dbx info for template class methods not yet supported");
+#ifdef HAVE_TEMPLATES
+	    if (warn_template_debugging)
+	      warning ("dbx info for template class methods not yet supported");
+#endif
 	  }
 	return;
       }

gcc/flags.h

@@ -96,6 +96,11 @@ extern int warn_return_type;
 
 extern int warn_cast_align;
 
+/* Nonzero means warn that dbx info for template class methods isn't fully
+   supported yet.  */
+
+extern int warn_template_debugging;
+
 /* Nonzero means warn about any identifiers that match in the first N
    characters.  The value N is in `id_clash_len'.  */