diff options
| author | Paul Eggert | 2012-08-24 21:04:08 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-08-24 21:04:08 -0700 |
| commit | f4a681b077a4af9f1eb36e0a109003262e2dafd1 (patch) | |
| tree | f08a7aea4f14c0581b848931007ab892bda3b7b7 /lib | |
| parent | 2f221583cf4a4b412c16260d148b59931b12455a (diff) | |
| download | emacs-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 'lib')
| -rw-r--r-- | lib/gnulib.mk | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/lib/gnulib.mk b/lib/gnulib.mk index a90cc59bbde..d49eb4fdf7a 100644 --- a/lib/gnulib.mk +++ b/lib/gnulib.mk | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | # the same distribution terms as the rest of that program. | 21 | # the same distribution terms as the rest of that program. |
| 22 | # | 22 | # |
| 23 | # Generated by gnulib-tool. | 23 | # Generated by gnulib-tool. |
| 24 | # Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=errno --avoid=fcntl --avoid=fcntl-h --avoid=fstat --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ filemode getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat manywarnings mktime pselect pthread_sigmask readlink socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timespec-add timespec-sub utimens warnings | 24 | # Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=errno --avoid=fcntl --avoid=fcntl-h --avoid=fstat --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo filemode getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat manywarnings mktime pselect pthread_sigmask readlink socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timespec-add timespec-sub utimens warnings |
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | MOSTLYCLEANFILES += core *.stackdump | 27 | MOSTLYCLEANFILES += core *.stackdump |
| @@ -150,6 +150,31 @@ EXTRA_libgnu_a_SOURCES += dup2.c | |||
| 150 | 150 | ||
| 151 | ## end gnulib module dup2 | 151 | ## end gnulib module dup2 |
| 152 | 152 | ||
| 153 | ## begin gnulib module execinfo | ||
| 154 | |||
| 155 | BUILT_SOURCES += $(EXECINFO_H) | ||
| 156 | |||
| 157 | # We need the following in order to create <execinfo.h> when the system | ||
| 158 | # doesn't have one that works. | ||
| 159 | if GL_GENERATE_EXECINFO_H | ||
| 160 | execinfo.h: execinfo.in.h $(top_builddir)/config.status | ||
| 161 | $(AM_V_GEN)rm -f $@-t $@ && \ | ||
| 162 | { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ | ||
| 163 | cat $(srcdir)/execinfo.in.h; \ | ||
| 164 | } > $@-t && \ | ||
| 165 | mv $@-t $@ | ||
| 166 | else | ||
| 167 | execinfo.h: $(top_builddir)/config.status | ||
| 168 | rm -f $@ | ||
| 169 | endif | ||
| 170 | MOSTLYCLEANFILES += execinfo.h execinfo.h-t | ||
| 171 | |||
| 172 | EXTRA_DIST += execinfo.c execinfo.in.h | ||
| 173 | |||
| 174 | EXTRA_libgnu_a_SOURCES += execinfo.c | ||
| 175 | |||
| 176 | ## end gnulib module execinfo | ||
| 177 | |||
| 153 | ## begin gnulib module filemode | 178 | ## begin gnulib module filemode |
| 154 | 179 | ||
| 155 | libgnu_a_SOURCES += filemode.c | 180 | libgnu_a_SOURCES += filemode.c |