Cygnus<-->FSF merge

From-SVN: r3303

diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index b1122a00c6a4d9eefd76a24fb952433a58426bd0..d9cc0c653f93840e16a198c23266295bfe548f12 100644 (file)
--- a/gcc/dbxout.c
+++ b/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;
       }

diff --git a/gcc/flags.h b/gcc/flags.h
index 7238899f7732c45a2fa869a5092c249c33f069b7..0e3b28b3b55a9263966d481f144432e664be387d 100644 (file)
--- a/gcc/flags.h
+++ b/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'.  */