From e1665c5543e729ee66a91f53df20ac5e49daa417 Mon Sep 17 00:00:00 2001 From: Bruno Haible <bruno@clisp.org> Date: Wed, 5 Jan 2022 20:03:13 +0100 Subject: [PATCH] Fix last commit. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Based on a patch by José E. Marchesi <jemarch@gnu.org>, reported in <https://lists.gnu.org/archive/html/bug-gnulib/2022-01/msg00036.html>. * m4/gnulib-common.m4 (gl_CC_GNULIB_WARNINGS): Don't enable -Wimplicit-fallthrough for GCC < 7. --- ChangeLog | 8 ++++++++ m4/gnulib-common.m4 | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f10b0b2aad..ad29aed978 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2022-01-05 Bruno Haible <bruno@clisp.org> + + Fix last commit. + Based on a patch by José E. Marchesi <jemarch@gnu.org>, reported in + <https://lists.gnu.org/archive/html/bug-gnulib/2022-01/msg00036.html>. + * m4/gnulib-common.m4 (gl_CC_GNULIB_WARNINGS): Don't enable + -Wimplicit-fallthrough for GCC < 7. + 2022-01-05 Bruno Haible <bruno@clisp.org> gnulib-tool: Avoid known warnings that reflect Gnulib's coding style. diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index 179aac7aa1..afe0836083 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -896,7 +896,7 @@ AC_DEFUN([gl_CC_GNULIB_WARNINGS], dnl -Wno-conversion >= 3 >= 3.9 dnl -Wno-float-conversion >= 4.9 >= 3.9 dnl -Wno-float-equal >= 3 >= 3.9 - dnl -Wimplicit-fallthrough >= 3 >= 3.9 + dnl -Wimplicit-fallthrough >= 7 >= 3.9 dnl -Wno-pedantic >= 4.8 >= 3.9 dnl -Wno-sign-compare >= 3 >= 3.9 dnl -Wno-sign-conversion >= 4.3 >= 3.9 @@ -911,7 +911,6 @@ AC_DEFUN([gl_CC_GNULIB_WARNINGS], -Wno-cast-qual -Wno-conversion -Wno-float-equal - -Wimplicit-fallthrough -Wno-sign-compare -Wno-undef -Wno-unused-function @@ -920,6 +919,9 @@ AC_DEFUN([gl_CC_GNULIB_WARNINGS], #if __GNUC__ + (__GNUC_MINOR__ >= 9) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3) -Wno-float-conversion #endif + #if __GNUC__ >= 7 || (__clang_major__ + (__clang_minor__ >= 9) > 3) + -Wimplicit-fallthrough + #endif #if __GNUC__ + (__GNUC_MINOR__ >= 8) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3) -Wno-pedantic #endif -- 2.39.5