diff options
| author | Florian Weimer <fweimer@redhat.com> | 2022-01-04 15:47:30 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2022-01-04 15:47:30 +0100 |
| commit | 790854ea7670f11c14d431c102a49181d2915965 (patch) | |
| tree | 713db799f6e6f12d1018dc89fb8a2d7baafe22f7 | |
| parent | be661959a6b6d8f9c3c8608a746789e7b2ec3ca4 (diff) | |
| download | gcc-790854ea7670f11c14d431c102a49181d2915965.zip gcc-790854ea7670f11c14d431c102a49181d2915965.tar.gz gcc-790854ea7670f11c14d431c102a49181d2915965.tar.bz2 | |
libgcc: Use _dl_find_object in _Unwind_Find_FDE
libgcc/ChangeLog:
* unwind-dw2-fde-dip.c (_Unwind_Find_FDE): Call _dl_find_object
if available.
| -rw-r--r-- | libgcc/unwind-dw2-fde-dip.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c index b8da2a5..7de847c 100644 --- a/libgcc/unwind-dw2-fde-dip.c +++ b/libgcc/unwind-dw2-fde-dip.c @@ -504,6 +504,24 @@ _Unwind_Find_FDE (void *pc, struct dwarf_eh_bases *bases) if (ret != NULL) return ret; + /* Use DLFO_STRUCT_HAS_EH_DBASE as a proxy for the existence of a glibc-style + _dl_find_object function. */ +#ifdef DLFO_STRUCT_HAS_EH_DBASE + { + struct dl_find_object dlfo; + if (_dl_find_object (pc, &dlfo) == 0) + return find_fde_tail ((_Unwind_Ptr) pc, dlfo.dlfo_eh_frame, +# if DLFO_STRUCT_HAS_EH_DBASE + (_Unwind_Ptr) dlfo.dlfo_eh_dbase, +# else + NULL, +# endif + bases); + else + return NULL; + } +#endif /* DLFO_STRUCT_HAS_EH_DBASE */ + data.pc = (_Unwind_Ptr) pc; #if NEED_DBASE_MEMBER data.dbase = NULL; |