wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify mips gp0 handling. 

In all currently supported cases this is a nop.

llvm-svn: 266888
This commit is contained in:
Rafael Espindola 2016-04-20 17:20:49 +00:00
parent 02d0a635d6
commit 475dbf42e4
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lld/ELF/InputSection.cpp
View File

@ -206,11 +206,6 @@ getSymVA(uint32_t Type, typename ELFT::uint A, typename ELFT::uint P,
case R_RELAX_TLS_IE_TO_LE: case R_RELAX_TLS_IE_TO_LE:
case R_RELAX_TLS_LD_TO_LE: case R_RELAX_TLS_LD_TO_LE:
return Body.getVA<ELFT>(A); 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: case R_GOT_OFF:
return Body.getGotOffset<ELFT>() + A; return Body.getGotOffset<ELFT>() + A;
case R_MIPS_GOT_LOCAL: case R_MIPS_GOT_LOCAL:

1
lld/ELF/InputSection.h
View File

@ -37,7 +37,6 @@ enum RelExpr {
R_GOT_PC, R_GOT_PC,
R_MIPS_GOT, R_MIPS_GOT,
R_MIPS_GOT_LOCAL, R_MIPS_GOT_LOCAL,
R_MIPS_GP0,
R_NEG_TLS, R_NEG_TLS,
R_PAGE_PC, R_PAGE_PC,
R_PC, R_PC,

6
lld/ELF/Writer.cpp
View File

@ -630,8 +630,10 @@ void Writer<ELFT>::scanRelocs(InputSectionBase<ELFT> &C, ArrayRef<RelTy> Rels) {
if (!Config->Pic || Target->isRelRelative(Type) || Expr == R_PC || if (!Config->Pic || Target->isRelRelative(Type) || Expr == R_PC ||
Expr == R_SIZE || isAbsolute<ELFT>(Body)) { Expr == R_SIZE || isAbsolute<ELFT>(Body)) {
if (Config->EMachine == EM_MIPS && Body.isLocal() && if (Config->EMachine == EM_MIPS && Body.isLocal() &&
(Type == R_MIPS_GPREL16 || Type == R_MIPS_GPREL32)) (Type == R_MIPS_GPREL16 || Type == R_MIPS_GPREL32)) {
Expr = R_MIPS_GP0; Expr = R_ABS;
Addend += File.getMipsGp0();
}
C.Relocations.push_back({Expr, Type, Offset, Addend, &Body}); C.Relocations.push_back({Expr, Type, Offset, Addend, &Body});
continue; continue;
} }