Merge from trunk.

1 files changed, 15 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index ab2bf756a13..f33d61ef9f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,20 @@
-2011-09-04  Paul Eggert  <eggert@cs.ucla.edu>
+2011-09-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         Merge from gnulib, using build-aux to remove clutter (Bug#9169).
+        This is to fix the following problems:
+         . On FreeBSD 6.4, HP-UX 11.31, and Solaris 9, and when Emacs is
+           configured not to use gtk or any other thread-using library,
+           signals aren't blocked correctly.
+         . On IRIX 6.5 it fixes an unwanted clash between Emacs's
+           and IRIX's signal handling.
+         . On Cygwin 1.7.5 it works around an incompatibility with
+           the system pthread_sigmask.
+         . On MacOS X 10.5 (32-bit), files whose inode numbers
+           exceed 2**31 cannot be read or manipulated.
+         . pthread_sigmask: Actually use results of gl_THREADLIB.
+         . strtoimax, strtoumax: Avoid link error on OSF/1 with DTK cc.
+         . find 'ar' program that fits with --host argument.
+         . Allow the user to override the choice of AR, ARFLAGS, RANLIB.
         * autogen/README: Update destination list.
         * autogen/copy_autogen, autogen/update_autogen, .bzrignore:
         The autogenerated files compile, config.guess,