Merge pull request #309 from ikitayama/for-next

Fix test_basic test error
dyninst · Dec 27, 2016 · a78e380 · a78e380
2 parents 9b8e9c1 + e906362
commit a78e380
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/stackwalk/src/linux-swk.C b/stackwalk/src/linux-swk.C
@@ -96,7 +96,7 @@ int P_gettid()
 
 vsys_info *Dyninst::Stackwalker::getVsysInfo(ProcessState *ps)
 {
-#if defined(arch_x86_64)
+#if defined(arch_x86_64) || defined(arch_aarch64)
    if (ps->getAddressWidth() == 8)
       return NULL;
 #endif

diff --git a/symtabAPI/src/dwarfWalker.C b/symtabAPI/src/dwarfWalker.C
@@ -250,7 +250,8 @@ void DwarfParseActions::setModuleFromName(std::string moduleName)
 bool DwarfWalker::buildSrcFiles(Dwarf_Debug dbg, Dwarf_Die entry, StringTablePtr srcFiles) {
    Dwarf_Signed cnt = 0;
     char** srcFileList;
-   DWARF_ERROR_RET(dwarf_srcfiles(entry, &srcFileList, &cnt, NULL));
+   Dwarf_Error error;
+   DWARF_ERROR_RET(dwarf_srcfiles(entry, &srcFileList, &cnt, &error));
 
    if(!srcFiles->empty()) {
         return true;