aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert2012-08-24 21:04:08 -0700
committerPaul Eggert2012-08-24 21:04:08 -0700
commitf4a681b077a4af9f1eb36e0a109003262e2dafd1 (patch)
treef08a7aea4f14c0581b848931007ab892bda3b7b7 /admin
parent2f221583cf4a4b412c16260d148b59931b12455a (diff)
downloademacs-f4a681b077a4af9f1eb36e0a109003262e2dafd1.tar.gz
emacs-f4a681b077a4af9f1eb36e0a109003262e2dafd1.zip
On assertion failure, print backtrace if available.
Merge from gnulib, incorporating: 2012-08-24 execinfo: port to FreeBSD 2012-08-22 execinfo: new module * admin/merge-gnulib (GNULIB_MODULES): Add execinfo. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. * lib/execinfo.c, lib/execinfo.in.h, m4/execinfo.m4: New files. * src/alloc.c [ENABLE_CHECKING]: Include <execinfo.h>. (die) [ENABLE_CHECKING]: Print a backtrace if available. * src/Makefile.in (LIB_EXECINFO): New macro. (LIBES): Use it.
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog5
-rwxr-xr-xadmin/merge-gnulib2
2 files changed, 6 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index ea977e80cfa..0c674b91ea4 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
12012-08-24 Paul Eggert <eggert@cs.ucla.edu>
2
3 On assertion failure, print backtrace if available.
4 * merge-gnulib (GNULIB_MODULES): Add execinfo.
5
12012-08-16 Paul Eggert <eggert@cs.ucla.edu> 62012-08-16 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Use ASCII tests for character types. 8 Use ASCII tests for character types.
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 63865edf3ce..775d43e68d3 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -28,7 +28,7 @@ GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
28GNULIB_MODULES=' 28GNULIB_MODULES='
29 alloca-opt c-ctype c-strcase 29 alloca-opt c-ctype c-strcase
30 careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 30 careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
31 dtoastr dtotimespec dup2 environ 31 dtoastr dtotimespec dup2 environ execinfo
32 filemode getloadavg getopt-gnu gettime gettimeofday 32 filemode getloadavg getopt-gnu gettime gettimeofday
33 ignore-value intprops largefile lstat 33 ignore-value intprops largefile lstat
34 manywarnings mktime pselect pthread_sigmask readlink 34 manywarnings mktime pselect pthread_sigmask readlink