1 --- dyninst-9.3.1/symtabAPI/src/Object-elf.C.orig 2017-03-02 22:38:32.000000000 +0100
2 +++ dyninst-9.3.1/symtabAPI/src/Object-elf.C 2017-04-09 20:52:53.689096202 +0200
4 std::vector<ExceptionBlock> &addresses,
5 const mach_relative_info &mi)
7 - Offset try_start = (Offset) -1;
8 - Offset try_end = (Offset) -1;
9 - Offset catch_start = 0;
10 + unsigned long try_start = (unsigned long) -1;
11 + unsigned long try_end = (unsigned long) -1;
12 + unsigned long catch_start = 0;
14 Elf_X_Data data = except_table->get_data();
15 const unsigned char *datap = (const unsigned char *)data.get_string();
17 i += read_val_of_type(DW_EH_PE_udata8, &catch_start, datap + i, mi);
20 - if (try_start != (Offset) -1 && try_end != (Offset) -1) {
21 + if (try_start != (unsigned long) -1 && try_end != (unsigned long) -1) {
22 ExceptionBlock eb(try_start, (unsigned) (try_end - try_start), catch_start);
23 addresses.push_back(eb);
25 --- dyninst-9.3.1/symtabAPI/src/emitElf.C.orig 2017-03-02 22:38:32.000000000 +0100
26 +++ dyninst-9.3.1/symtabAPI/src/emitElf.C 2017-04-09 21:05:01.219087893 +0200
31 - vector<vector<unsigned long> > moveSecAddrRange = obj->getObject()->getMoveSecAddrRange();
32 + vector<vector<Offset> > moveSecAddrRange = obj->getObject()->getMoveSecAddrRange();
34 for (unsigned i = 0; i != moveSecAddrRange.size(); i++) {
35 if ((moveSecAddrRange[i][0] == shdr->sh_addr) ||
36 --- dyninst-9.3.1/symtabAPI/src/dwarfWalker.C.orig 2017-04-09 21:31:37.515736334 +0200
37 +++ dyninst-9.3.1/symtabAPI/src/dwarfWalker.C 2017-04-09 21:31:42.419069611 +0200
38 @@ -1820,13 +1820,13 @@
39 Dwarf_Attribute strattr;
41 if (attr == DW_AT_call_file || attr == DW_AT_decl_file) {
42 - unsigned long line_index;
44 bool result = findConstant(attr, line_index, entry(), dbg());
47 if (line_index >= mod()->getStrings()->size()) {
48 - dwarf_printf("Dwarf error reading line index %d from srcFiles of size %lu\n",
49 - line_index, mod()->getStrings()->size());
50 + dwarf_printf("Dwarf error reading line index %lu from srcFiles of size %lu\n",
51 + (unsigned long)line_index, mod()->getStrings()->size());
54 // cout << "findString found " << (*srcFiles())[line_index].str << " at srcFiles[" << line_index << "] for " << mod()->fileName() << endl;