summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wielaard <mjw@redhat.com>2009-07-23 12:02:11 +0200
committerMark Wielaard <mjw@redhat.com>2009-07-23 12:02:11 +0200
commit4a8636a307a9a532dcc60b5ad8bf809a20dc24c3 (patch)
treea439ca3609f5ebf474fe06f98211f058ffc83132
parent97f529ab5dad4aae9b1057397de84addcc42cacc (diff)
downloadsystemtap-steved-4a8636a307a9a532dcc60b5ad8bf809a20dc24c3.tar.gz
systemtap-steved-4a8636a307a9a532dcc60b5ad8bf809a20dc24c3.tar.xz
systemtap-steved-4a8636a307a9a532dcc60b5ad8bf809a20dc24c3.zip
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.
-rw-r--r--dwflpp.cxx2
-rw-r--r--loc2c-test.c2
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)