Merge from emacs-24; up to 2014-05-29T17:16:00Z!dmantipov@yandex.ru

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 88ebe08e0fce7a8ef1c23be7956570b1a3bab368..e437bd7b35d0a9fb9daab018eed0064eb255ee21 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-06-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix port to 32-bit AIX with xlc (Bug#17598).
+       This doesn't fix Bug#17598, but it does fix a regression since Emacs
+       built with xlc until recently, and perhaps it'll help us fix Bug#17598.
+       * configure.ac (GC_SETJMP_WORKS): Define for AIX, too.
+       Merge from gnulib, incorporating:
+       2014-05-30 ftoastr: work around compiler bug in IBM xlc 12.1
+       * lib/ftoastr.c: Update from gnulib.
+
 2014-06-01  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge from gnulib, incorporating: