summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfche <fche>2008-02-19 22:54:58 +0000
committerfche <fche>2008-02-19 22:54:58 +0000
commite484ef8550c99258afed0a61ce30a5a944391817 (patch)
treea49e34d827c0143265c048492d6b95c154f4bca9
parenta73014758df9ba7f832c8f13305652a777b574a9 (diff)
downloadsystemtap-steved-e484ef8550c99258afed0a61ce30a5a944391817.tar.gz
systemtap-steved-e484ef8550c99258afed0a61ce30a5a944391817.tar.xz
systemtap-steved-e484ef8550c99258afed0a61ce30a5a944391817.zip
2008-02-19 Frank Ch. Eigler <fche@elastic.org>
* tapsets.cxx (query_module): Tweak elf-machine checking to better represent elfutils idioms.
-rw-r--r--ChangeLog5
-rw-r--r--tapsets.cxx6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4306992a..cc23718e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-02-19 Frank Ch. Eigler <fche@elastic.org>
+ * tapsets.cxx (query_module): Tweak elf-machine checking to
+ better represent elfutils idioms.
+
+2008-02-19 Frank Ch. Eigler <fche@elastic.org>
+
PR 5766.
* tapsets.cxx (build_blacklist): Switch (back) to regexp-based
blacklist construction ...
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,