[gcc(refs/users/egallager/heads/autotools-tinkering)] turn -Wnarrowing back off again

[gcc(refs/users/egallager/heads/autotools-tinkering)] turn -Wnarrowing back off again

[Eric Gallager]

https://gcc.gnu.org/g:d902e4571877847abb542194f2ad50b5fa861813

commit d902e4571877847abb542194f2ad50b5fa861813
Author: Eric Gallager <egallager@gcc.gnu.org>
Date:   Wed May 25 09:45:44 2022 -0400

    turn -Wnarrowing back off again
    
    there are just too many errors from it in gcc/config/i386/i386.cc for me to fix so I give up on it for now

Diff:
---
 gcc/configure    | 22 +++++++++++-----------
 gcc/configure.ac |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/gcc/configure b/gcc/configure
index c4db8767d68..db66ff0ace3 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -7089,7 +7089,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 loose_warn=
 save_CXXFLAGS="$CXXFLAGS"
-for real_option in -Wall -Wextra -Wnarrowing -Wwrite-strings -Wcast-qual $wf_opt; do
+for real_option in -Wall -Wextra -Wno-narrowing -Wwrite-strings -Wcast-qual $wf_opt; do
   # Do the check with the no- prefix removed since gcc silently
   # accepts any -Wno-* option on purpose
   case $real_option in
@@ -7319,13 +7319,13 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 # Do the check with the no- prefix removed from the warning options
 # since gcc silently accepts any -Wno-* option on purpose
 if test "$GXX" = yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports -pedantic -Wlong-long -Wvariadic-macros -Woverlength-strings" >&5
-$as_echo_n "checking whether $CXX supports -pedantic -Wlong-long -Wvariadic-macros -Woverlength-strings... " >&6; }
-if ${acx_cv_prog_cc_pedantic__Wlong_long__Wvariadic_macros__Woverlength_strings+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports -pedantic -Wlong-long -Wvariadic-macros -Wmismatched-tags -Woverlength-strings" >&5
+$as_echo_n "checking whether $CXX supports -pedantic -Wlong-long -Wvariadic-macros -Wmismatched-tags -Woverlength-strings... " >&6; }
+if ${acx_cv_prog_cc_pedantic__Wlong_long__Wvariadic_macros__Wmismatched_tags__Woverlength_strings+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="-pedantic -Wlong-long -Wvariadic-macros -Woverlength-strings"
+CXXFLAGS="-pedantic -Wlong-long -Wvariadic-macros -Wmismatched-tags -Woverlength-strings"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -7338,17 +7338,17 @@ main ()
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  acx_cv_prog_cc_pedantic__Wlong_long__Wvariadic_macros__Woverlength_strings=yes
+  acx_cv_prog_cc_pedantic__Wlong_long__Wvariadic_macros__Wmismatched_tags__Woverlength_strings=yes
 else
-  acx_cv_prog_cc_pedantic__Wlong_long__Wvariadic_macros__Woverlength_strings=no
+  acx_cv_prog_cc_pedantic__Wlong_long__Wvariadic_macros__Wmismatched_tags__Woverlength_strings=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 CXXFLAGS="$save_CXXFLAGS"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_prog_cc_pedantic__Wlong_long__Wvariadic_macros__Woverlength_strings" >&5
-$as_echo "$acx_cv_prog_cc_pedantic__Wlong_long__Wvariadic_macros__Woverlength_strings" >&6; }
-if test $acx_cv_prog_cc_pedantic__Wlong_long__Wvariadic_macros__Woverlength_strings = yes; then :
-  strict_warn="$strict_warn${strict_warn:+ }-pedantic -Wno-long-long -Wno-variadic-macros -Woverlength-strings"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_prog_cc_pedantic__Wlong_long__Wvariadic_macros__Wmismatched_tags__Woverlength_strings" >&5
+$as_echo "$acx_cv_prog_cc_pedantic__Wlong_long__Wvariadic_macros__Wmismatched_tags__Woverlength_strings" >&6; }
+if test $acx_cv_prog_cc_pedantic__Wlong_long__Wvariadic_macros__Wmismatched_tags__Woverlength_strings = yes; then :
+  strict_warn="$strict_warn${strict_warn:+ }-pedantic -Wno-long-long -Wno-variadic-macros -Wno-mismatched-tags -Woverlength-strings"
 fi
 
 fi
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 3eb4b336518..223e6bc03a5 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -572,7 +572,7 @@ AC_ARG_ENABLE(build-format-warnings,
 AS_IF([test $enable_build_format_warnings = no],
       [wf_opt=-Wno-format],[wf_opt=])
 ACX_PROG_CXX_WARNING_OPTS(
-	m4_quote(m4_do([-Wall -Wextra -Wnarrowing -Wwrite-strings ],
+	m4_quote(m4_do([-Wall -Wextra -Wno-narrowing -Wwrite-strings ],
 		       [-Wcast-qual $wf_opt])),
 		       [loose_warn])
 ACX_PROG_CC_WARNING_OPTS(
@@ -584,7 +584,7 @@ ACX_PROG_CXX_WARNING_OPTS(
 ACX_PROG_CC_WARNING_OPTS(
 	m4_quote(m4_do([-Wold-style-definition -Wc++-compat])), [c_strict_warn])
 ACX_PROG_CXX_WARNING_ALMOST_PEDANTIC(
-	m4_quote(m4_do([-Wno-long-long -Wno-variadic-macros ], 
+	m4_quote(m4_do([-Wno-long-long -Wno-variadic-macros -Wno-mismatched-tags ], 
 		       [-Woverlength-strings])), [strict_warn])
 ACX_PROG_CXX_WARNINGS_ARE_ERRORS([manual], [strict_warn])