diff options
| author | Mark Wielaard <mjw@redhat.com> | 2010-02-02 16:27:47 +0100 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2010-02-02 16:32:12 +0100 |
| commit | 495b9d7c310985f3c185f4ca642b521141d9b722 (patch) | |
| tree | 21e1585073b879c8efd2d4873ba7437a3d6ead89 | |
| parent | 743757687f9c09bf9ef84b576bc0aa0fc19dea4c (diff) | |
| download | systemtap-steved-495b9d7c310985f3c185f4ca642b521141d9b722.tar.gz systemtap-steved-495b9d7c310985f3c185f4ca642b521141d9b722.tar.xz systemtap-steved-495b9d7c310985f3c185f4ca642b521141d9b722.zip | |
Support building against elfutils < 0.142 again.
* dwflpp.cxx (get_cfa_ops): Guard new cfi related code and variables.
| -rw-r--r-- | dwflpp.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -2784,11 +2784,11 @@ dwflpp::get_cfa_ops (Dwarf_Addr pc) clog << "get_cfa_ops @0x" << hex << pc << dec << ", module_start @0x" << hex << module_start << dec << endl; +#if _ELFUTILS_PREREQ(0,142) // Try debug_frame first, then fall back on eh_frame. size_t cfa_nops = 0; Dwarf_Addr bias = 0; Dwarf_Frame *frame = NULL; -#if _ELFUTILS_PREREQ(0,142) Dwarf_CFI *cfi = dwfl_module_dwarf_cfi (module, &bias); if (cfi != NULL) { @@ -2825,6 +2825,7 @@ dwflpp::get_cfa_ops (Dwarf_Addr pc) { if (cfa_ops == NULL) clog << "not found cfa" << endl; +#if _ELFUTILS_PREREQ(0,142) else { Dwarf_Addr frame_start, frame_end; @@ -2835,6 +2836,7 @@ dwflpp::get_cfa_ops (Dwarf_Addr pc) << frame_start << dec << ", end: 0x" << hex << frame_end << dec << "), nops: " << cfa_nops << endl; } +#endif } return cfa_ops; |