From b00ffa282f3c494012a127919f8625e14d89f80d Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 24 May 2023 09:23:01 -0700
Subject: [PATCH] Simplify -Wno-missing-field-initializers checking
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* m4/gnulib-common.m4 (gl_CC_GNULIB_WARNINGS): Don’t worry about
-Wmissing-field-initializers, as this is no longer needed now that
gl_MANYWARN_ALL_GCC is fixed.
---
 ChangeLog           | 5 +++++
 m4/gnulib-common.m4 | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 81057be3d6..e09a981eec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2023-05-24  Paul Eggert  <eggert@cs.ucla.edu>
 
+	Simplify -Wno-missing-field-initializers checking
+	* m4/gnulib-common.m4 (gl_CC_GNULIB_WARNINGS): Don’t worry about
+	-Wmissing-field-initializers, as this is no longer needed now that
+	gl_MANYWARN_ALL_GCC is fixed.
+
 	manywarnings: port better to GCC 11.2 and earlier
 	Problem reported by Bruno Haible in:
 	https://lists.gnu.org/r/bug-diffutils/2023-05/msg00015.html
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index a2b53d33dc..2426eb6398 100644
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -1053,7 +1053,6 @@ AC_DEFUN([gl_CC_GNULIB_WARNINGS],
     dnl -Wno-float-conversion                 >= 4.9          >= 3.9
     dnl -Wno-float-equal                      >= 3            >= 3.9
     dnl -Wimplicit-fallthrough                >= 7            >= 3.9
-    dnl -Wno-missing-field-initializers       >= 4.0, < 11
     dnl -Wno-pedantic                         >= 4.8          >= 3.9
     dnl -Wno-sign-compare                     >= 3            >= 3.9
     dnl -Wno-sign-conversion                  >= 4.3          >= 3.9
@@ -1079,9 +1078,6 @@ AC_DEFUN([gl_CC_GNULIB_WARNINGS],
       #if __GNUC__ >= 7 || (__clang_major__ + (__clang_minor__ >= 9) > 3)
       -Wimplicit-fallthrough
       #endif
-      #if __GNUC__ >= 4 && __GNUC__ < 11 && !defined __clang__
-      -Wno-missing-field-initializers
-      #endif
       #if __GNUC__ + (__GNUC_MINOR__ >= 8) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3)
       -Wno-pedantic
       #endif
-- 
2.39.5