Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-04-03 05:32:24 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

This reverts commit r269359 and r269360.

Browse Source 
I will commit again with a fixed commit message.

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

14
lld/ELF/Writer.cpp
View File

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