[gcc(refs/users/marxin/heads/fix-Wformat-diag-with-rtl-checking)] Fix Werror=format-diag with --disable-nls.

[gcc(refs/users/marxin/heads/fix-Wformat-diag-with-rtl-checking)] Fix Werror=format-diag with --disable-nls.

[Martin Liska]

https://gcc.gnu.org/g:9d3892cbfcccd1355c3fad5c144db3f4ca28eb4a

commit 9d3892cbfcccd1355c3fad5c144db3f4ca28eb4a
Author: Martin Liska <mliska@suse.cz>
Date:   Thu Jan 20 09:30:01 2022 +0100

    Fix Werror=format-diag with --disable-nls.
    
            PR c++/104134
    
    gcc/cp/ChangeLog:
    
            * error.cc (dump_aggr_type): Partially disable the warning.

Diff:
---
 gcc/cp/error.cc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gcc/cp/error.cc b/gcc/cp/error.cc
index 1ab0c25a477..c031c75cc5e 100644
--- a/gcc/cp/error.cc
+++ b/gcc/cp/error.cc
@@ -768,6 +768,11 @@ class_key_or_enum_as_string (tree t)
     return "struct";
 }
 
+#if __GNUC__ >= 10
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-diag"
+#endif
+
 /* Print out a class declaration T under the control of FLAGS,
    in the form `class foo'.  */
 
@@ -851,6 +856,10 @@ dump_aggr_type (cxx_pretty_printer *pp, tree t, int flags)
 			 flags & ~TFF_TEMPLATE_HEADER);
 }
 
+#if __GNUC__ >= 10
+#pragma GCC diagnostic pop
+#endif
+
 /* Dump into the obstack the initial part of the output for a given type.
    This is necessary when dealing with things like functions returning
    functions.  Examples: