aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-01-02 17:59:58 -0800
committerPaul Eggert2014-01-02 17:59:58 -0800
commit3d814710389b7929b052782c262eb081f35c5dd4 (patch)
tree9e055bbb5c8451621de385b51e4c3de011d72424
parent8f9740f0e7ef3b591ba87d8c4488ae638b899a3a (diff)
downloademacs-3d814710389b7929b052782c262eb081f35c5dd4.tar.gz
emacs-3d814710389b7929b052782c262eb081f35c5dd4.zip
Merge from gnulib.
This incorporates: 2014-01-02 manywarnings: remove -Wmudflap This ports better to GCC 4.9-to-be.
-rw-r--r--ChangeLog6
-rw-r--r--m4/manywarnings.m41
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b9ee422bea2..24ff1b50abf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
12014-01-03 Paul Eggert <eggert@cs.ucla.edu>
2
3 Merge from gnulib, incorporating:
4 2014-01-02 manywarnings: remove -Wmudflap
5 This ports better to GCC 4.9-to-be.
6
12013-12-31 Fabrice Popineau <fabrice.popineau@supelec.fr> 72013-12-31 Fabrice Popineau <fabrice.popineau@supelec.fr>
2 8
3 * configure.ac (canonical, C_SWITCH_SYSTEM): Support a 64-bit 9 * configure.ac (canonical, C_SWITCH_SYSTEM): Support a 64-bit
diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4
index 8339d40f8f9..e1cee6cf9d1 100644
--- a/m4/manywarnings.m4
+++ b/m4/manywarnings.m4
@@ -146,7 +146,6 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC],
146 -Wmissing-include-dirs \ 146 -Wmissing-include-dirs \
147 -Wmissing-parameter-type \ 147 -Wmissing-parameter-type \
148 -Wmissing-prototypes \ 148 -Wmissing-prototypes \
149 -Wmudflap \
150 -Wmultichar \ 149 -Wmultichar \
151 -Wnarrowing \ 150 -Wnarrowing \
152 -Wnested-externs \ 151 -Wnested-externs \