1 files changed, 10 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 3789203527c..30561d6ac13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-05-30  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-05-22  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix port to 32-bit AIX (Bug#17540).