[lld] r273004 - Simplify. NFC.

Rafael Espindola via llvm-commits llvm-commits at lists.llvm.org
Fri Jun 17 08:01:51 PDT 2016


Author: rafael
Date: Fri Jun 17 10:01:50 2016
New Revision: 273004

URL: http://llvm.org/viewvc/llvm-project?rev=273004&view=rev
Log:
Simplify. NFC.

Modified:
    lld/trunk/ELF/Relocations.cpp

Modified: lld/trunk/ELF/Relocations.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Relocations.cpp?rev=273004&r1=273003&r2=273004&view=diff
==============================================================================
--- lld/trunk/ELF/Relocations.cpp (original)
+++ lld/trunk/ELF/Relocations.cpp Fri Jun 17 10:01:50 2016
@@ -381,7 +381,7 @@ template <class ELFT> static void addCop
 template <class ELFT>
 static RelExpr adjustExpr(const elf::ObjectFile<ELFT> &File, SymbolBody &Body,
                           bool IsWrite, RelExpr Expr, uint32_t Type,
-                          const uint8_t *Data, typename ELFT::uint Offset) {
+                          const uint8_t *Data) {
   if (Target->needsThunk(Type, File, Body))
     return R_THUNK;
   bool Preemptible = isPreemptible(Body, Type);
@@ -391,7 +391,7 @@ static RelExpr adjustExpr(const elf::Obj
     if (needsPlt(Expr))
       Expr = fromPlt(Expr);
     if (Expr == R_GOT_PC)
-      Expr = Target->adjustRelaxExpr(Type, Data + Offset, Expr);
+      Expr = Target->adjustRelaxExpr(Type, Data, Expr);
   }
 
   if (IsWrite || isStaticLinkTimeConstant<ELFT>(Expr, Type, Body))
@@ -516,7 +516,7 @@ static void scanRelocs(InputSectionBase<
       continue;
 
     bool Preemptible = isPreemptible(Body, Type);
-    Expr = adjustExpr(File, Body, IsWrite, Expr, Type, Buf, Offset);
+    Expr = adjustExpr(File, Body, IsWrite, Expr, Type, Buf + Offset);
     if (HasError)
       continue;
 




More information about the llvm-commits mailing list