merge trunk

1 files changed, 24 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 5657f8bb3aa..228cf1d74d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2012-08-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * configure.ac (CFLAGS): Prefer -g3 to -g if -g3 works
+        and if the user has not specified CFLAGS.  -g3 simplifies
+        debugging, since it makes macros visible to the debugger.
+
+2012-08-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * lib/makefile.w32-in ($(BLD)/execinfo.$(O)): Update dependencies.
+
+2012-08-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * lib/makefile.w32-in ($(BLD)/execinfo.$(O), execinfo.h): New targets.
+        (GNULIBOBJS): Add $(BLD)/execinfo.$(O).
+
+2012-08-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+        On assertion failure, print backtrace if available.
+        Merge from gnulib, incorporating:
+        2012-08-24 execinfo: port to FreeBSD
+        2012-08-22 execinfo: new module
+        * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
+        * lib/execinfo.c, lib/execinfo.in.h, m4/execinfo.m4: New files.
+
 2012-08-22  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (install-arch-dep): If NO_BIN_LINK is non-null,