aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorPo Lu2023-05-17 09:16:48 +0800
committerPo Lu2023-05-17 09:16:48 +0800
commitbb95cdaa0693ecea2953d14f2808a23b66ac9446 (patch)
tree0baff93b05b3d75ce7cec9f491ea7c687942adb5 /m4
parentbb8bf9203ed33de0bb269c8ff69067aa7b3a692a (diff)
parent6cb963b73c3768958e13e96b2534d1e99239a3ff (diff)
downloademacs-bb95cdaa0693ecea2953d14f2808a23b66ac9446.tar.gz
emacs-bb95cdaa0693ecea2953d14f2808a23b66ac9446.zip
Merge remote-tracking branch 'origin/master' into feature/android
Diffstat (limited to 'm4')
-rw-r--r--m4/gnulib-common.m46
1 files changed, 5 insertions, 1 deletions
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index edb8572da25..a2b53d33dca 100644
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
1# gnulib-common.m4 serial 86 1# gnulib-common.m4 serial 87
2dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. 2dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
@@ -1053,6 +1053,7 @@ AC_DEFUN([gl_CC_GNULIB_WARNINGS],
1053 dnl -Wno-float-conversion >= 4.9 >= 3.9 1053 dnl -Wno-float-conversion >= 4.9 >= 3.9
1054 dnl -Wno-float-equal >= 3 >= 3.9 1054 dnl -Wno-float-equal >= 3 >= 3.9
1055 dnl -Wimplicit-fallthrough >= 7 >= 3.9 1055 dnl -Wimplicit-fallthrough >= 7 >= 3.9
1056 dnl -Wno-missing-field-initializers >= 4.0, < 11
1056 dnl -Wno-pedantic >= 4.8 >= 3.9 1057 dnl -Wno-pedantic >= 4.8 >= 3.9
1057 dnl -Wno-sign-compare >= 3 >= 3.9 1058 dnl -Wno-sign-compare >= 3 >= 3.9
1058 dnl -Wno-sign-conversion >= 4.3 >= 3.9 1059 dnl -Wno-sign-conversion >= 4.3 >= 3.9
@@ -1078,6 +1079,9 @@ AC_DEFUN([gl_CC_GNULIB_WARNINGS],
1078 #if __GNUC__ >= 7 || (__clang_major__ + (__clang_minor__ >= 9) > 3) 1079 #if __GNUC__ >= 7 || (__clang_major__ + (__clang_minor__ >= 9) > 3)
1079 -Wimplicit-fallthrough 1080 -Wimplicit-fallthrough
1080 #endif 1081 #endif
1082 #if __GNUC__ >= 4 && __GNUC__ < 11 && !defined __clang__
1083 -Wno-missing-field-initializers
1084 #endif
1081 #if __GNUC__ + (__GNUC_MINOR__ >= 8) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3) 1085 #if __GNUC__ + (__GNUC_MINOR__ >= 8) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3)
1082 -Wno-pedantic 1086 -Wno-pedantic
1083 #endif 1087 #endif