mirror of
https://github.com/tobast/libunwind-eh_elf.git
synced 2024-11-25 08:37:38 +01:00
Fix up the breakage when host != target
This commit is contained in:
parent
851f14281c
commit
d20df8b318
5 changed files with 24 additions and 2 deletions
|
@ -296,5 +296,6 @@ AC_SUBST(DLLIB)
|
||||||
AC_SUBST(BACKTRACELIB)
|
AC_SUBST(BACKTRACELIB)
|
||||||
|
|
||||||
AC_CONFIG_FILES(Makefile src/Makefile tests/Makefile tests/check-namespace.sh
|
AC_CONFIG_FILES(Makefile src/Makefile tests/Makefile tests/check-namespace.sh
|
||||||
doc/Makefile doc/common.tex include/libunwind-common.h)
|
doc/Makefile doc/common.tex include/libunwind-common.h
|
||||||
|
include/libunwind.h include/tdep/libunwind_i.h)
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
/* Provide a real file - not a symlink - as it would cause multiarch conflicts
|
/* Provide a real file - not a symlink - as it would cause multiarch conflicts
|
||||||
when multiple different arch releases are installed simultaneously. */
|
when multiple different arch releases are installed simultaneously. */
|
||||||
|
|
||||||
|
#ifndef UNW_REMOTE_ONLY
|
||||||
|
|
||||||
#if defined __arm__
|
#if defined __arm__
|
||||||
# include "libunwind-arm.h"
|
# include "libunwind-arm.h"
|
||||||
#elif defined __hppa__
|
#elif defined __hppa__
|
||||||
|
@ -20,3 +22,9 @@
|
||||||
#else
|
#else
|
||||||
# error "Unsupported arch"
|
# error "Unsupported arch"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#else /* UNW_REMOTE_ONLY */
|
||||||
|
|
||||||
|
# include "libunwind-@arch@.h"
|
||||||
|
|
||||||
|
#endif /* UNW_REMOTE_ONLY */
|
|
@ -1,6 +1,8 @@
|
||||||
/* Provide a real file - not a symlink - as it would cause multiarch conflicts
|
/* Provide a real file - not a symlink - as it would cause multiarch conflicts
|
||||||
when multiple different arch releases are installed simultaneously. */
|
when multiple different arch releases are installed simultaneously. */
|
||||||
|
|
||||||
|
#ifndef UNW_REMOTE_ONLY
|
||||||
|
|
||||||
#if defined __arm__
|
#if defined __arm__
|
||||||
# include "tdep-arm/jmpbuf.h"
|
# include "tdep-arm/jmpbuf.h"
|
||||||
#elif defined __hppa__
|
#elif defined __hppa__
|
||||||
|
@ -20,3 +22,5 @@
|
||||||
#else
|
#else
|
||||||
# error "Unsupported arch"
|
# error "Unsupported arch"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif /* !UNW_REMOTE_ONLY */
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
/* Provide a real file - not a symlink - as it would cause multiarch conflicts
|
/* Provide a real file - not a symlink - as it would cause multiarch conflicts
|
||||||
when multiple different arch releases are installed simultaneously. */
|
when multiple different arch releases are installed simultaneously. */
|
||||||
|
|
||||||
|
#ifndef UNW_REMOTE_ONLY
|
||||||
|
|
||||||
#if defined __arm__
|
#if defined __arm__
|
||||||
# include "tdep-arm/libunwind_i.h"
|
# include "tdep-arm/libunwind_i.h"
|
||||||
#elif defined __hppa__
|
#elif defined __hppa__
|
||||||
|
@ -20,3 +22,10 @@
|
||||||
#else
|
#else
|
||||||
# error "Unsupported arch"
|
# error "Unsupported arch"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#else /* UNW_REMOTE_ONLY */
|
||||||
|
|
||||||
|
# include "tdep-@arch@/libunwind_i.h"
|
||||||
|
|
||||||
|
#endif /* UNW_REMOTE_ONLY */
|
|
@ -241,7 +241,7 @@ file_error:
|
||||||
static int
|
static int
|
||||||
find_binary_for_address (unw_word_t ip, char *name, size_t name_size)
|
find_binary_for_address (unw_word_t ip, char *name, size_t name_size)
|
||||||
{
|
{
|
||||||
#ifdef __linux
|
#if defined(__linux) && (!UNW_REMOTE_ONLY)
|
||||||
struct map_iterator mi;
|
struct map_iterator mi;
|
||||||
int found = 0;
|
int found = 0;
|
||||||
int pid = getpid ();
|
int pid = getpid ();
|
||||||
|
|
Loading…
Reference in a new issue