Index: ELF/DWARF.cpp
===================================================================
--- ELF/DWARF.cpp
+++ ELF/DWARF.cpp
@@ -54,6 +54,22 @@
   }
 }
 
+namespace {
+template <class RelTy> struct Resolver {
+  static Optional<uint64_t> Resolve(object::RelocationRef Ref, uint64_t S,
+                                    int64_t A) {
+    return S + Ref.getRawDataRefImpl().p;
+  }
+};
+
+template <class ELFT> struct Resolver<Elf_Rel_Impl<ELFT, false>> {
+  static Optional<uint64_t> Resolve(object::RelocationRef Ref, uint64_t S,
+                                    int64_t A) {
+    return S + A;
+  }
+};
+} // namespace
+
 // Find if there is a relocation at Pos in Sec.  The code is a bit
 // more complicated than usual because we need to pass a section index
 // to llvm since it has no idea about InputSection.
@@ -83,14 +99,17 @@
             llvm::utohexstr(Rel.r_offset) + " has unsupported target");
     return None;
   }
-  uint64_t Val = DR->Value + getAddend<ELFT>(Rel);
+  uint64_t Val = DR->Value;
 
   // FIXME: We should be consistent about always adding the file
   // offset or not.
   if (DR->Section->Flags & ELF::SHF_ALLOC)
     Val += cast<InputSection>(DR->Section)->getOffsetInFile();
 
-  return RelocAddrEntry{SecIndex, Val};
+  DataRefImpl D;
+  D.p = getAddend<ELFT>(Rel);
+  return RelocAddrEntry{SecIndex, RelocationRef(D, nullptr),
+                        Resolver<typename ELFT::Rela>::Resolve, Val};
 }
 
 template <class ELFT>