aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris <[email protected]>2014-06-01 17:18:22 -0700
committerGlenn Morris <[email protected]>2014-06-01 17:18:22 -0700
commit953e106ac84587e765244995687b088969b5f6e1 (patch)
treea4d54b892e04b9123bc79ecffd69310f5807399e /ChangeLog
parenteed652d649d28e9dafdb01f9c7425d7d28899e0d (diff)
parentafca0e759015ebc753b0c343ac45ac476dd31e9d (diff)
Merge from emacs-24; up to 2014-05-29T17:16:[email protected]
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog10
1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 88ebe08e0f..e437bd7b35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-06-02 Paul Eggert <[email protected]>
+
+ 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 <[email protected]>
Merge from gnulib, incorporating: