[lld] r248317 - Fix a merge problem.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Tue Sep 22 15:06:19 2015
New Revision: 248317

URL: http://llvm.org/viewvc/llvm-project?rev=248317&view=rev
Log:
Fix a merge problem.

r248289 got lots when I moved code to Target.cpp. Sorry about that.

Modified:
    lld/trunk/ELF/Target.cpp

Modified: lld/trunk/ELF/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.cpp?rev=248317&r1=248316&r2=248317&view=diff
==============================================================================
--- lld/trunk/ELF/Target.cpp (original)
+++ lld/trunk/ELF/Target.cpp Tue Sep 22 15:06:19 2015
@@ -68,7 +68,7 @@ void X86_64TargetInfo::writePltEntry(uin
   Buf += Jmp.size();
 
   uintptr_t NextPC = PltEntryAddr + 6;
-  uintptr_t Delta = GotEntryAddr - NextPC;
+  intptr_t Delta = GotEntryAddr - NextPC;
   assert(isInt<32>(Delta));
   support::endian::write32le(Buf, Delta);
   Buf += 4;