From 4a8636a307a9a532dcc60b5ad8bf809a20dc24c3 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 23 Jul 2009 12:02:11 +0200 Subject: Workaround cfa_nops not being needed on earlier elfutils. * dwflpp.cxx (get_cfa_ops): Only define cfa_nops if _ELFUTILS_PREREQ(0,142). * loc2c-test.c (main): Likewise. --- dwflpp.cxx | 2 +- loc2c-test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dwflpp.cxx b/dwflpp.cxx index 427f1d74..ce9993c8 100644 --- a/dwflpp.cxx +++ b/dwflpp.cxx @@ -2543,7 +2543,6 @@ Dwarf_Op * dwflpp::get_cfa_ops (Dwarf_Addr pc) { Dwarf_Op *cfa_ops = NULL; - size_t cfa_nops; if (sess.verbose > 2) clog << "get_cfa_ops @0x" << hex << pc << dec @@ -2552,6 +2551,7 @@ dwflpp::get_cfa_ops (Dwarf_Addr pc) #ifdef _ELFUTILS_PREREQ #if _ELFUTILS_PREREQ(0,142) // Try debug_frame first, then fall back on eh_frame. + size_t cfa_nops; Dwarf_Addr bias; Dwarf_CFI *cfi = dwfl_module_dwarf_cfi (module, &bias); if (cfi != NULL) diff --git a/loc2c-test.c b/loc2c-test.c index 88e9047c..ccd9510c 100644 --- a/loc2c-test.c +++ b/loc2c-test.c @@ -526,10 +526,10 @@ main (int argc, char **argv) else { Dwarf_Op *cfa_ops = NULL; - size_t cfa_nops; #ifdef _ELFUTILS_PREREQ #if _ELFUTILS_PREREQ(0,142) + size_t cfa_nops; Dwarf_Addr bias; Dwfl_Module *module = dwfl_addrmodule (dwfl, pc); if (module != NULL) -- cgit