From 0f3edcb9bf9eab6aad85829cbfae680321cbae49 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Wed, 7 Nov 2012 17:07:15 -0800 Subject: [PATCH] stapdyn: loadLibrary now returns BPatch_object BPatch_addressSpace::loadLibrary changed its return value before Dyninst 8.0 final. We wanted the BPatch_object anyway, so now we don't have to get it indirectly through BPatch_module::getObject. Also, bump the rpm spec to require the actual Dyninst 8.0. --- stapdyn/mutatee.cxx | 5 ++--- systemtap.spec | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/stapdyn/mutatee.cxx b/stapdyn/mutatee.cxx index 88a9ee506..052d5b987 100644 --- a/stapdyn/mutatee.cxx +++ b/stapdyn/mutatee.cxx @@ -101,14 +101,13 @@ mutatee::~mutatee() bool mutatee::load_stap_dso(const string& filename) { - BPatch_module* stap_mod = process->loadLibrary(filename.c_str()); - if (!stap_mod) + stap_dso = process->loadLibrary(filename.c_str()); + if (!stap_dso) { staperror() << "Couldn't load " << filename << " into the target process" << endl; return false; } - stap_dso = stap_mod->getObject(); return true; } diff --git a/systemtap.spec b/systemtap.spec index 16027dd32..a655220be 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -54,8 +54,7 @@ BuildRequires: gcc-c++ BuildRequires: gettext-devel BuildRequires: nss-devel avahi-devel pkgconfig %if %{with_dyninst} -# include the prerelease version for now, but really this is >= 8.0 -BuildRequires: dyninst-devel >= 7.99 +BuildRequires: dyninst-devel >= 8.0 BuildRequires: libselinux-devel %endif %if %{with_sqlite} -- 2.43.5