Simplify mips gp0 handling.
In all currently supported cases this is a nop.
llvm-svn: 266888
diff --git a/lld/ELF/InputSection.cpp b/lld/ELF/InputSection.cpp
index 3df6cf00..6b4b803 100644
--- a/lld/ELF/InputSection.cpp
+++ b/lld/ELF/InputSection.cpp
@@ -206,11 +206,6 @@
case R_RELAX_TLS_IE_TO_LE:
case R_RELAX_TLS_LD_TO_LE:
return Body.getVA<ELFT>(A);
- case R_MIPS_GP0:
- // We need to adjust SymVA value in case of R_MIPS_GPREL16/32
- // relocations because they use the following expression to calculate
- // the relocation's result for local symbol: S + A + GP0 - G.
- return Body.getVA<ELFT>(A) + File.getMipsGp0();
case R_GOT_OFF:
return Body.getGotOffset<ELFT>() + A;
case R_MIPS_GOT_LOCAL:
diff --git a/lld/ELF/InputSection.h b/lld/ELF/InputSection.h
index c34c94d..1e243e8 100644
--- a/lld/ELF/InputSection.h
+++ b/lld/ELF/InputSection.h
@@ -37,7 +37,6 @@
R_GOT_PC,
R_MIPS_GOT,
R_MIPS_GOT_LOCAL,
- R_MIPS_GP0,
R_NEG_TLS,
R_PAGE_PC,
R_PC,
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index df846dd..8d276ec 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -630,8 +630,10 @@
if (!Config->Pic || Target->isRelRelative(Type) || Expr == R_PC ||
Expr == R_SIZE || isAbsolute<ELFT>(Body)) {
if (Config->EMachine == EM_MIPS && Body.isLocal() &&
- (Type == R_MIPS_GPREL16 || Type == R_MIPS_GPREL32))
- Expr = R_MIPS_GP0;
+ (Type == R_MIPS_GPREL16 || Type == R_MIPS_GPREL32)) {
+ Expr = R_ABS;
+ Addend += File.getMipsGp0();
+ }
C.Relocations.push_back({Expr, Type, Offset, Addend, &Body});
continue;
}