commit ba822bda4a3c18ae613252f84ec65b7fb15465ff
author Fangrui Song <maskray@google.com> Fri Aug 16 17:01:56 2019 +0000
committer Fangrui Song <maskray@google.com> Fri Aug 16 17:01:56 2019 +0000
tree 8244c6e00673b75df42c199bd597db15e809adf6
parent 63c0481298770a5e9624359e71fabaf69b1d6077

[ELF][Hexagon] Replace R_HEXAGON_GOT with R_GOTPLT

R_GOTPLT is relative to .got.plt since D59594. Since R_HEXAGON_GOT
relocations always have 0 r_addend, they can use R_GOTPLT instead.

Reviewed By: sidneym

Differential Revision: https://reviews.llvm.org/D66274

git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@369128 91177308-0d34-0410-b5e6-96231b3b80d8

ELF/Arch/Hexagon.cpp

diff --git a/ELF/Arch/Hexagon.cpp b/ELF/Arch/Hexagon.cpp
index f4268c0..e805b55 100644
--- a/ELF/Arch/Hexagon.cpp
+++ b/ELF/Arch/Hexagon.cpp
@@ -103,7 +103,7 @@
   case R_HEX_GOT_11_X:
   case R_HEX_GOT_16_X:
   case R_HEX_GOT_32_6_X:
-    return R_HEXAGON_GOT;
+    return R_GOTPLT;
   default:
     return R_ABS;
   }

ELF/InputSection.cpp

diff --git a/ELF/InputSection.cpp b/ELF/InputSection.cpp
index c9a02c9..e8a821b 100644
--- a/ELF/InputSection.cpp
+++ b/ELF/InputSection.cpp
@@ -672,8 +672,6 @@
   case R_GOT_PC:
   case R_RELAX_TLS_GD_TO_IE:
     return sym.getGotVA() + a - p;
-  case R_HEXAGON_GOT:
-    return sym.getGotVA() - in.gotPlt->getVA();
   case R_MIPS_GOTREL:
     return sym.getVA(a) - in.mipsGot->getGp(file);
   case R_MIPS_GOT_GP:

ELF/Relocations.cpp

diff --git a/ELF/Relocations.cpp b/ELF/Relocations.cpp
index d611acb..bb629a0 100644
--- a/ELF/Relocations.cpp
+++ b/ELF/Relocations.cpp
@@ -344,9 +344,9 @@
 // returns false for TLS variables even though they need GOT, because
 // TLS variables uses GOT differently than the regular variables.
 static bool needsGot(RelExpr expr) {
-  return oneof<R_GOT, R_GOT_OFF, R_HEXAGON_GOT, R_MIPS_GOT_LOCAL_PAGE,
-               R_MIPS_GOT_OFF, R_MIPS_GOT_OFF32, R_AARCH64_GOT_PAGE_PC,
-               R_GOT_PC, R_GOTPLT>(expr);
+  return oneof<R_GOT, R_GOT_OFF, R_MIPS_GOT_LOCAL_PAGE, R_MIPS_GOT_OFF,
+               R_MIPS_GOT_OFF32, R_AARCH64_GOT_PAGE_PC, R_GOT_PC, R_GOTPLT>(
+      expr);
 }
 
 // True if this expression is of the form Sym - X, where X is a position in the
@@ -369,7 +369,7 @@
 static bool isStaticLinkTimeConstant(RelExpr e, RelType type, const Symbol &sym,
                                      InputSectionBase &s, uint64_t relOff) {
   // These expressions always compute a constant
-  if (oneof<R_DTPREL, R_GOTPLT, R_GOT_OFF, R_HEXAGON_GOT, R_TLSLD_GOT_OFF,
+  if (oneof<R_DTPREL, R_GOTPLT, R_GOT_OFF, R_TLSLD_GOT_OFF,
             R_MIPS_GOT_LOCAL_PAGE, R_MIPS_GOTREL, R_MIPS_GOT_OFF,
             R_MIPS_GOT_OFF32, R_MIPS_GOT_GP_PC, R_MIPS_TLSGD,
             R_AARCH64_GOT_PAGE_PC, R_GOT_PC, R_GOTONLY_PC, R_GOTPLTONLY_PC,

ELF/Relocations.h

diff --git a/ELF/Relocations.h b/ELF/Relocations.h
index d74d7b9..befe15b 100644
--- a/ELF/Relocations.h
+++ b/ELF/Relocations.h
@@ -82,7 +82,6 @@
   R_AARCH64_RELAX_TLS_GD_TO_IE_PAGE_PC,
   R_AARCH64_TLSDESC_PAGE,
   R_ARM_SBREL,
-  R_HEXAGON_GOT,
   R_MIPS_GOTREL,
   R_MIPS_GOT_GP,
   R_MIPS_GOT_GP_PC,