commit 58cd5db4effb68dfe889f28d9f53801dac0a280d
author Rafael Espindola <rafael.espindola@gmail.com> Tue Apr 19 22:46:03 2016 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Tue Apr 19 22:46:03 2016 +0000
tree 4822c314b933b4f8d43ccb2b9e76473a291b683e
parent c138b64578936d3d0377a322877db5dead0b8982

Simplify mips got handling.

This avoids computing the address of a position in the got just to then
subtract got->getva().

llvm-svn: 266831

lld/ELF/Target.cpp

diff --git a/lld/ELF/Target.cpp b/lld/ELF/Target.cpp
index 0e07fae..48c5f6a 100644
--- a/lld/ELF/Target.cpp
+++ b/lld/ELF/Target.cpp
@@ -1510,7 +1510,7 @@
       return R_MIPS_GOT_LOCAL;
     if (!S.isPreemptible())
       return R_MIPS_GOT;
-    return R_GOT;
+    return R_GOT_OFF;
   }
 }
 
@@ -1726,14 +1726,12 @@
     write32<E>(Loc, (Instr & ~0x3ffffff) | (Val >> 2));
     break;
   }
+  case R_MIPS_GOT16:
+    checkInt<16>(Val, Type);
+  // fallthrough
   case R_MIPS_CALL16:
-  case R_MIPS_GOT16: {
-    int64_t V = Val - getMipsGpAddr<ELFT>();
-    if (Type == R_MIPS_GOT16)
-      checkInt<16>(V, Type);
-    writeMipsLo16<E>(Loc, V);
+    writeMipsLo16<E>(Loc, Val);
     break;
-  }
   case R_MIPS_GPREL16: {
     int64_t V = Val - getMipsGpAddr<ELFT>();
     checkInt<16>(V, Type);