m2-internship/libunwind-eh_elf
1
0
Fork 0
mirror of https://github.com/tobast/libunwind-eh_elf.git synced 2024-11-25 08:37:38 +01:00
Code Issues Releases Activity

Added --enable-setjmp

Browse source 
Currently, libunwind-setjmp is built whenever local unwinding is
built.  This patch adds an explicit flag to control it instead.
The default if not specified is to follow the old behavior.
This commit is contained in:
Matt Fischer 2013-04-18 18:32:53 -05:00
parent abb0957198
commit 563b0ff314
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

@ -118,6 +118,14 @@ AC_ARG_ENABLE(ptrace,
AC_MSG_CHECKING([if we should build libunwind-ptrace]) AC_MSG_CHECKING([if we should build libunwind-ptrace])
AC_MSG_RESULT([$enable_ptrace]) AC_MSG_RESULT([$enable_ptrace])
AC_ARG_ENABLE(setjmp,
AS_HELP_STRING([--enable-setjmp],[building libunwind-setjmp library]),,
[AS_IF([test x$target_arch == x$host_arch], [enable_setjmp=yes], [enable_setjmp=no])]
)
AC_MSG_CHECKING([if we should build libunwind-setjmp])
AC_MSG_RESULT([$enable_setjmp])
AC_MSG_CHECKING([for build architecture]) AC_MSG_CHECKING([for build architecture])
AC_MSG_RESULT([$build_arch]) AC_MSG_RESULT([$build_arch])
AC_MSG_CHECKING([for host architecture]) AC_MSG_CHECKING([for host architecture])
@ -129,6 +137,7 @@ AC_MSG_RESULT([$target_os])
AM_CONDITIONAL(BUILD_COREDUMP, test x$enable_coredump = xyes) AM_CONDITIONAL(BUILD_COREDUMP, test x$enable_coredump = xyes)
AM_CONDITIONAL(BUILD_PTRACE, test x$enable_ptrace = xyes) AM_CONDITIONAL(BUILD_PTRACE, test x$enable_ptrace = xyes)
AM_CONDITIONAL(BUILD_SETJMP, test x$enable_setjmp = xyes)
AM_CONDITIONAL(REMOTE_ONLY, test x$target_arch != x$host_arch) AM_CONDITIONAL(REMOTE_ONLY, test x$target_arch != x$host_arch)
AM_CONDITIONAL(ARCH_ARM, test x$target_arch = xarm) AM_CONDITIONAL(ARCH_ARM, test x$target_arch = xarm)
AM_CONDITIONAL(ARCH_IA64, test x$target_arch = xia64) AM_CONDITIONAL(ARCH_IA64, test x$target_arch = xia64)

8
src/Makefile.am
View file

@ -25,13 +25,17 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libunwind-generic.pc pkgconfig_DATA = libunwind-generic.pc
if !REMOTE_ONLY if !REMOTE_ONLY
pkgconfig_DATA += unwind/libunwind.pc setjmp/libunwind-setjmp.pc pkgconfig_DATA += unwind/libunwind.pc
endif endif
if BUILD_PTRACE if BUILD_PTRACE
pkgconfig_DATA += ptrace/libunwind-ptrace.pc pkgconfig_DATA += ptrace/libunwind-ptrace.pc
endif endif
if BUILD_SETJMP
pkgconfig_DATA += setjmp/libunwind-setjmp.pc
endif
if BUILD_COREDUMP if BUILD_COREDUMP
pkgconfig_DATA += coredump/libunwind-coredump.pc pkgconfig_DATA += coredump/libunwind-coredump.pc
endif endif
@ -554,7 +558,7 @@ endif # ARCH_ARM
# libunwind-setjmp depends on libunwind-$(arch). Therefore must be added # libunwind-setjmp depends on libunwind-$(arch). Therefore must be added
# at the end. # at the end.
if !REMOTE_ONLY if BUILD_SETJMP
lib_LTLIBRARIES += libunwind-setjmp.la lib_LTLIBRARIES += libunwind-setjmp.la
endif endif

8
tests/Makefile.am
View file

@ -45,8 +45,8 @@ endif #!ARCH_IA64
Gtest-dyn1 Ltest-dyn1 \ Gtest-dyn1 Ltest-dyn1 \
Gtest-trace Ltest-trace \ Gtest-trace Ltest-trace \
test-async-sig test-flush-cache test-init-remote \ test-async-sig test-flush-cache test-init-remote \
test-mem test-setjmp Ltest-varargs \ test-mem Ltest-varargs Ltest-nomalloc \
Ltest-nomalloc Ltest-nocalloc Lrs-race Ltest-nocalloc Lrs-race
noinst_PROGRAMS_cdep = forker crasher Gperf-simple Lperf-simple \ noinst_PROGRAMS_cdep = forker crasher Gperf-simple Lperf-simple \
Gperf-trace Lperf-trace Gperf-trace Lperf-trace
@ -56,6 +56,10 @@ if BUILD_PTRACE
noinst_PROGRAMS_cdep += mapper test-ptrace-misc noinst_PROGRAMS_cdep += mapper test-ptrace-misc
endif endif
if BUILD_SETJMP
check_PROGRAMS_cdep += test-setjmp
endif
if SUPPORT_CXX_EXCEPTIONS if SUPPORT_CXX_EXCEPTIONS
check_PROGRAMS_cdep += Ltest-cxx-exceptions check_PROGRAMS_cdep += Ltest-cxx-exceptions
endif endif