[lld] r236336 - Revert unrelated chunk committed by accident in r236334.

Davide Italiano davide at freebsd.org
Fri May 1 12:24:29 PDT 2015


Author: davide
Date: Fri May  1 14:24:29 2015
New Revision: 236336

URL: http://llvm.org/viewvc/llvm-project?rev=236336&view=rev
Log:
Revert unrelated chunk committed by accident in r236334.

The change is likely to be correct, but unrelated to the aforementioned
commit and needs a test to gets shipped. Sorry.

Modified:
    lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.cpp

Modified: lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.cpp?rev=236336&r1=236335&r2=236336&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.cpp Fri May  1 14:24:29 2015
@@ -24,7 +24,7 @@ static void reloc64(uint8_t *location, u
 /// \brief R_X86_64_PC32 - word32: S + A - P
 static void relocPC32(uint8_t *location, uint64_t P, uint64_t S, int64_t A) {
   uint32_t result = (uint32_t)(S + A - P);
-  write32le(location, result | read32le(location));
+  write32le(location, result + read32le(location));
 }
 
 /// \brief R_X86_64_32 - word32:  S + A





More information about the llvm-commits mailing list