[llvm] r235081 - Revert "[RuntimeDyldELF] Fix missing cases in Placeholder processing"

[Pavel Labath]

Author: labath
Date: Thu Apr 16 03:58:11 2015
New Revision: 235081

URL: http://llvm.org/viewvc/llvm-project?rev=235081&view=rev
Log:
Revert "[RuntimeDyldELF] Fix missing cases in Placeholder processing"

This reverts commit ec0a34f850eca0d97e0592236e0ac14083aa1c3d.

Modified:
    llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp

Modified: llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp?rev=235081&r1=235080&r2=235081&view=diff
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp Thu Apr 16 03:58:11 2015
@@ -460,7 +460,7 @@ void RuntimeDyldELF::resolveARMRelocatio
     else if (Type == ELF::R_ARM_MOVT_ABS)
       Value = (Value >> 16) & 0xFFFF;
     *TargetPtr &= ~0x000F0FFF;
-    *TargetPtr |= Value & 0xFFF;
+    *TargetPtr = Value & 0xFFF;
     *TargetPtr |= ((Value >> 12) & 0xF) << 16;
     break;
     // Write 24 bit relative value to the branch instruction.
@@ -1052,8 +1052,6 @@ relocation_iterator RuntimeDyldELF::proc
         Value.Addend += ((*Placeholder) & 0x0000ffff) << 16;
       else if (RelType == ELF::R_MIPS_LO16)
         Value.Addend += ((*Placeholder) & 0x0000ffff);
-      else if (RelType == ELF::R_MIPS_32)
-        Value.Addend += *Placeholder;
       processSimpleRelocation(SectionID, Offset, RelType, Value);
     }
   } else if (Arch == Triple::ppc64 || Arch == Triple::ppc64le) {