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

Handle thunks in adjustExpr. 

This is similar to the other changes this function does. With this all
Relocations.push_back calls look similar.

llvm-svn: 269362
This commit is contained in:
Rafael Espindola 2016-05-12 21:53:34 +00:00
parent 62cb02eef1
commit 01f1636408
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lld/ELF/Writer.cpp
View File

@ -69,7 +69,8 @@ private:
void scanRelocs(InputSection<ELFT> &C); void scanRelocs(InputSection<ELFT> &C);
void scanRelocs(InputSectionBase<ELFT> &S, const Elf_Shdr &RelSec); void scanRelocs(InputSectionBase<ELFT> &S, const Elf_Shdr &RelSec);
RelExpr adjustExpr(SymbolBody &S, bool IsWrite, RelExpr Expr, uint32_t Type); RelExpr adjustExpr(const elf::ObjectFile<ELFT> &File, SymbolBody &S,
bool IsWrite, RelExpr Expr, uint32_t Type);
void createPhdrs(); void createPhdrs();
void assignAddresses(); void assignAddresses();
void assignFileOffsets(); void assignFileOffsets();
@ -513,8 +514,11 @@ static RelExpr fromPlt(RelExpr Expr) {
} }
template <class ELFT> template <class ELFT>
RelExpr Writer<ELFT>::adjustExpr(SymbolBody &Body, bool IsWrite, RelExpr Expr, RelExpr Writer<ELFT>::adjustExpr(const elf::ObjectFile<ELFT> &File,
SymbolBody &Body, bool IsWrite, RelExpr Expr,
uint32_t Type) { uint32_t Type) {
if (Target->needsThunk(Type, File, Body))
return R_THUNK;
bool Preemptible = Body.isPreemptible(); bool Preemptible = Body.isPreemptible();
if (Body.isGnuIFunc()) if (Body.isGnuIFunc())
Expr = toPlt(Expr); Expr = toPlt(Expr);
@ -614,7 +618,7 @@ void Writer<ELFT>::scanRelocs(InputSectionBase<ELFT> &C, ArrayRef<RelTy> Rels) {
continue; continue;
bool Preemptible = Body.isPreemptible(); bool Preemptible = Body.isPreemptible();
Expr = adjustExpr(Body, IsWrite, Expr, Type); Expr = adjustExpr(File, Body, IsWrite, Expr, Type);
if (HasError) if (HasError)
continue; continue;
@ -679,8 +683,8 @@ void Writer<ELFT>::scanRelocs(InputSectionBase<ELFT> &C, ArrayRef<RelTy> Rels) {
continue; continue;
} }
if (Target->needsThunk(Type, File, Body)) { if (Expr == R_THUNK) {
C.Relocations.push_back({R_THUNK, Type, Offset, Addend, &Body}); C.Relocations.push_back({Expr, Type, Offset, Addend, &Body});
continue; continue;
} }