mirror of
https://github.com/tobast/libunwind-eh_elf.git
synced 2024-11-15 20:58:13 +01:00
(is_local_addr_space): Always return 0 for UNW_REMOTE_ONLY.
(_Uia64_search_unwind_table): Add a cast to avoid compiler-warning when cross-compiling from a 32-bit platform. (Logical change 1.46)
This commit is contained in:
parent
d7c5192ef8
commit
3980b80e26
1 changed files with 5 additions and 5 deletions
|
@ -42,13 +42,13 @@ lookup (struct ia64_table_entry *table, size_t table_size, unw_word_t rel_ip)
|
||||||
static inline int
|
static inline int
|
||||||
is_local_addr_space (unw_addr_space_t as)
|
is_local_addr_space (unw_addr_space_t as)
|
||||||
{
|
{
|
||||||
|
#ifdef UNW_REMOTE_ONLY
|
||||||
|
return 0;
|
||||||
|
#else
|
||||||
extern unw_addr_space_t _ULia64_local_addr_space;
|
extern unw_addr_space_t _ULia64_local_addr_space;
|
||||||
|
|
||||||
return (as == _Uia64_local_addr_space
|
return (as == _Uia64_local_addr_space || as == _ULia64_local_addr_space);
|
||||||
#ifndef UNW_REMOTE_ONLY
|
|
||||||
|| as == _ULia64_local_addr_space
|
|
||||||
#endif
|
#endif
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
@ -99,7 +99,7 @@ _Uia64_search_unwind_table (unw_addr_space_t as, unw_word_t ip,
|
||||||
pi->unwind_info_size = 8 * IA64_UNW_LENGTH (hdr);
|
pi->unwind_info_size = 8 * IA64_UNW_LENGTH (hdr);
|
||||||
|
|
||||||
if (is_local_addr_space (as))
|
if (is_local_addr_space (as))
|
||||||
pi->unwind_info = (void *) info_addr;
|
pi->unwind_info = (void *) (uintptr_t) info_addr;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* Internalize unwind info. Note: since we're doing this
|
/* Internalize unwind info. Note: since we're doing this
|
||||||
|
|
Loading…
Reference in a new issue