From e484ef8550c99258afed0a61ce30a5a944391817 Mon Sep 17 00:00:00 2001 From: fche Date: Tue, 19 Feb 2008 22:54:58 +0000 Subject: 2008-02-19 Frank Ch. Eigler * tapsets.cxx (query_module): Tweak elf-machine checking to better represent elfutils idioms. --- ChangeLog | 5 +++++ tapsets.cxx | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4306992a..cc23718e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-02-19 Frank Ch. Eigler + + * tapsets.cxx (query_module): Tweak elf-machine checking to + better represent elfutils idioms. + 2008-02-19 Frank Ch. Eigler PR 5766. diff --git a/tapsets.cxx b/tapsets.cxx index e89cfe90..0e8bad81 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -3132,8 +3132,10 @@ query_module (Dwfl_Module *mod, Dwarf_Addr _junk; Elf* elf = dwfl_module_getelf (mod, &_junk); - Ebl* ebl = ebl_openbackend (elf); - int elf_machine = ebl_get_elfmachine (ebl); + GElf_Ehdr ehdr_mem; + GElf_Ehdr* em = gelf_getehdr (elf, &ehdr_mem); + if (em == 0) { q->dw.dwfl_assert ("dwfl_getehdr", dwfl_errno()); } + int elf_machine = em->e_machine; const char* debug_filename = ""; const char* main_filename = ""; (void) dwfl_module_info (mod, NULL, NULL, -- cgit