Adapting Object-elf.C

dyninst · Feb 18, 2017 · f37d44e · f37d44e
1 parent 44f740b
commit f37d44e
Show file tree

Hide file tree

Showing 25 changed files with 479 additions and 479 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ set(RT_BINARY_DIR ${PROJECT_BINARY_DIR}/dyninstAPI_RT)
 
 include (${DYNINST_ROOT}/cmake/shared.cmake)
 
-configure_file(cmake/version.h.in common/h/version.h)
+configure_file(cmake/version.h.in common/h/dyninstversion.h)
 include_directories(${PROJECT_BINARY_DIR})
 include_directories(${PROJECT_BINARY_DIR}/common/h)
 set (HEADER_DIRS common

diff --git a/cmake/Modules/FindLibDwarf.cmake b/cmake/Modules/FindLibDwarf.cmake
@@ -18,18 +18,14 @@ endif (LIBDWARF_LIBRARIES AND LIBDWARF_INCLUDE_DIRS)
 
 find_path (LIBDWARF_INCLUDE_DIR
   NAMES
-  libdw.h
+  elfutils/libdw.h
   HINTS
   ${LIBDWARF_INCLUDE_DIRS}
   PATHS
   /usr/include
-  /usr/include/elfutils
   /usr/local/include
   /opt/local/include
   /sw/include
-  /usr/local/include/elfutils
-  /opt/local/include/elfutils
-  /sw/include/elfutils
   ENV CPATH) # PATH and INCLUDE will also work
 
 find_library (LIBDWARF_LIBRARIES

diff --git a/cmake/packages.cmake b/cmake/packages.cmake
@@ -15,7 +15,7 @@ if (UNIX)
       )
     set(LIBELF_INCLUDE_DIR ${CMAKE_BINARY_DIR}/elfutils/include)
     set(LIBELF_LIBRARIES ${CMAKE_BINARY_DIR}/elfutils/lib/libelf.so)
-    set(LIBDWARF_INCLUDE_DIR ${CMAKE_BINARY_DIR}/elfutils/include/elfutils)
+    set(LIBDWARF_INCLUDE_DIR ${CMAKE_BINARY_DIR}/elfutils/include)
     set(LIBDWARF_LIBRARIES ${CMAKE_BINARY_DIR}/elfutils/lib/libdw.so)
     set(SHOULD_INSTALL_LIBELF 1)
   else()

diff --git a/dwarf/h/dwarfExprParser.h b/dwarf/h/dwarfExprParser.h
@@ -33,7 +33,7 @@
 
 #include <stack>
 #include "dyn_regs.h"
-#include "libdw.h"
+#include "elfutils/libdw.h"
 #include "dwarf.h"
 #include "util.h"
 

diff --git a/dwarf/h/dwarfFrameParser.h b/dwarf/h/dwarfFrameParser.h
@@ -36,7 +36,7 @@
 #include "dyntypes.h"
 #include "dyn_regs.h"
 #include "ProcReader.h"
-#include "libdw.h"
+#include "elfutils/libdw.h"
 #include "util.h"
 
 namespace Dyninst {

diff --git a/dwarf/h/dwarfHandle.h b/dwarf/h/dwarfHandle.h
@@ -31,7 +31,7 @@
 #if !defined(DWARF_HANDLE_H_)
 #define DWARF_HANDLE_H_
 
-#include "libdw.h"
+#include "elfutils/libdw.h"
 #include "dyntypes.h"
 #include <map>
 #include <string>

diff --git a/dwarf/h/dwarfResult.h b/dwarf/h/dwarfResult.h
@@ -33,7 +33,7 @@
 
 #include "dyn_regs.h"
 #include "dyntypes.h"
-#include "libdw.h"
+#include "elfutils/libdw.h"
 #include "util.h"
 
 namespace Dyninst {

diff --git a/dwarf/src/dwarfFrameParser.C b/dwarf/src/dwarfFrameParser.C
@@ -33,7 +33,7 @@
 #include "dwarfResult.h"
 #include "VariableLocation.h"
 #include "Types.h"
-#include "libdw.h"
+#include "elfutils/libdw.h"
 #include <stdio.h>
 #include <iostream>
 #include "debug_common.h" // dwarf_printf

diff --git a/dwarf/src/dwarfHandle.C b/dwarf/src/dwarfHandle.C
@@ -28,7 +28,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libdw.h"
+#include "elfutils/libdw.h"
 #include "Elf_X.h"
 #include "dwarfHandle.h"
 #include "dwarfFrameParser.h"

diff --git a/dyninstAPI/h/BPatch.h b/dyninstAPI/h/BPatch.h
@@ -42,7 +42,7 @@
 #include "BPatch_callbacks.h"
 #include <set>
 
-#include "version.h"
+#include "dyninstversion.h"
 
 class BPatch_typeCollection;
 class BPatch_libInfo;

diff --git a/dyninstAPI/src/image.C b/dyninstAPI/src/image.C
@@ -67,7 +67,7 @@
 
 #if defined( cap_dwarf )
 #include "dwarf.h"
-#include "libdw.h"
+#include "elfutils/libdw.h"
 #endif
 
 #if defined(_MSC_VER)

diff --git a/instructionAPI/src/Instruction.C b/instructionAPI/src/Instruction.C
@@ -48,7 +48,7 @@
 #include <functional>
 
 #include "common/src/arch-x86.h"
-#include "version.h"
+#include "dyninstversion.h"
 
 using namespace std;
 using namespace NS_x86;

diff --git a/parseAPI/src/CodeObject.C b/parseAPI/src/CodeObject.C
@@ -35,7 +35,7 @@
 #include "Parser.h"
 #include "debug_parse.h"
 
-#include "version.h"
+#include "dyninstversion.h"
 
 using namespace std;
 using namespace Dyninst;

diff --git a/patchAPI/src/PatchMgr.C b/patchAPI/src/PatchMgr.C
@@ -35,7 +35,7 @@
 #include "Point.h"
 #include "PatchCallback.h"
 
-#include "version.h"
+#include "dyninstversion.h"
 
 using namespace Dyninst;
 using namespace PatchAPI;

diff --git a/proccontrol/src/process.C b/proccontrol/src/process.C
@@ -27,7 +27,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "version.h"
+#include "dyninstversion.h"
 #include "int_process.h"
 #include "irpc.h"
 #include "procpool.h"

diff --git a/stackwalk/h/walker.h b/stackwalk/h/walker.h
@@ -38,7 +38,7 @@
 #include <string>
 #include <utility>
 
-#include "version.h"
+#include "dyninstversion.h"
 
 #define SW_MAJOR DYNINST_MAJOR_VERSION
 #define SW_MINOR DYNINST_MINOR_VERSION

diff --git a/stackwalk/src/dbginfo-stepper.C b/stackwalk/src/dbginfo-stepper.C
@@ -55,7 +55,7 @@ static std::map<std::string, DwarfFrameParser::Ptr> dwarf_info;
 
 #include <stdarg.h>
 #include "dwarf.h"
-#include "libdw.h"
+#include "elfutils/libdw.h"
 #include "Elf_X.h"
 
 static DwarfFrameParser::Ptr getAuxDwarfInfo(std::string s)

diff --git a/symtabAPI/h/Module.h b/symtabAPI/h/Module.h
@@ -39,7 +39,7 @@
 #include "IBSTree.h"
 #include "IBSTree-fast.h"
 #if defined(cap_dwarf)
-#include "libdw.h"
+#include "elfutils/libdw.h"
 #endif
 #include <boost/shared_ptr.hpp>
 #include "RangeLookup.h"

diff --git a/symtabAPI/h/Symtab.h b/symtabAPI/h/Symtab.h
@@ -42,7 +42,7 @@
 #include "ProcReader.h"
 #include "IBSTree.h"
 
-#include "version.h"
+#include "dyninstversion.h"
 
 #include "boost/shared_ptr.hpp"
 #include "boost/multi_index_container.hpp"