intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-26 12:26:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remember the input section of locals.

Browse Source 
This is already a simplification, but will allow much more.

llvm-svn: 263224
This commit is contained in:
Rafael Espindola
2016-03-11 12:14:02 +00:00
parent ec5872bc42
commit ccb8b4d4fe
5 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lld/ELF/InputFiles.cpp
View File

@@ -292,7 +292,7 @@ template <class ELFT>
SymbolBody *elf::ObjectFile<ELFT>::createSymbolBody(const Elf_Sym *Sym) {
unsigned char Binding = Sym->getBinding();
if (Binding == STB_LOCAL)
return new (Alloc) LocalSymbol<ELFT>(*Sym);
return new (Alloc) LocalSymbol<ELFT>(*Sym, getSection(*Sym));
StringRef Name = check(Sym->getName(this->StringTable));

20
lld/ELF/OutputSections.cpp
View File

@@ -267,12 +267,20 @@ template <class ELFT> void RelocationSection<ELFT>::writeTo(uint8_t *Buf) {
if (IsRela) {
uintX_t VA = 0;
if (Rel.UseSymVA)
VA = Sym->getVA<ELFT>();
else if (Rel.TargetSec)
VA = Rel.TargetSec->getOffset(Rel.OffsetInTargetSec) +
Rel.TargetSec->OutSec->getVA();
reinterpret_cast<Elf_Rela *>(P)->r_addend = Rel.Addend + VA;
uintX_t Addend = Rel.Addend;
if (Rel.UseSymVA) {
if (auto *L = dyn_cast<LocalSymbol<ELFT>>(Sym)) {
uintX_t Pos = L->Sym.st_value;
if (L->Sym.getType() == STT_SECTION) {
Pos += Addend;
Addend = 0;
}
VA = L->Section->OutSec->getVA() + L->Section->getOffset(Pos);
} else {
VA = Sym->getVA<ELFT>();
}
}
reinterpret_cast<Elf_Rela *>(P)->r_addend = Addend + VA;
}
P->r_offset = Rel.getOffset();

9
lld/ELF/OutputSections.h
View File

@@ -186,8 +186,6 @@ template <class ELFT> struct DynamicReloc {
InputSectionBase<ELFT> *OffsetSec = nullptr;
uintX_t OffsetInSec = 0;
bool UseSymVA = false;
InputSectionBase<ELFT> *TargetSec = nullptr;
uintX_t OffsetInTargetSec = 0;
uintX_t Addend = 0;
DynamicReloc(uint32_t Type, OffsetKind OKind, SymbolBody *Sym)
@@ -202,13 +200,6 @@ template <class ELFT> struct DynamicReloc {
: Type(Type), OKind(Off_Sec), Sym(Sym), OffsetSec(OffsetSec),
OffsetInSec(OffsetInSec), UseSymVA(UseSymVA), Addend(Addend) {}
DynamicReloc(uint32_t Type, InputSectionBase<ELFT> *OffsetSec,
uintX_t OffsetInSec, InputSectionBase<ELFT> *TargetSec,
uintX_t OffsetInTargetSec, uintX_t Addend)
: Type(Type), OKind(Off_Sec), OffsetSec(OffsetSec),
OffsetInSec(OffsetInSec), TargetSec(TargetSec),
OffsetInTargetSec(OffsetInTargetSec), Addend(Addend) {}
uintX_t getOffset() const;
};

7
lld/ELF/Symbols.h
View File

@@ -310,12 +310,15 @@ template <class ELFT> class LocalSymbol : public DefinedElf<ELFT> {
typedef typename llvm::object::ELFFile<ELFT>::Elf_Sym Elf_Sym;
public:
LocalSymbol(const Elf_Sym &Sym)
: DefinedElf<ELFT>(SymbolBody::DefinedLocalKind, "", Sym) {}
LocalSymbol(const Elf_Sym &Sym, InputSectionBase<ELFT> *Section)
: DefinedElf<ELFT>(SymbolBody::DefinedLocalKind, "", Sym),
Section(Section) {}
static bool classof(const SymbolBody *S) {
return S->kind() == SymbolBody::DefinedLocalKind;
}
InputSectionBase<ELFT> *Section;
};
// This class represents a symbol defined in an archive file. It is

14
lld/ELF/Writer.cpp
View File

@@ -474,20 +474,8 @@ void Writer<ELFT>::scanRelocs(
(uintX_t)getPPC64TocBase() + Addend});
continue;
}
if (!Body.isLocal()) {
Out<ELFT>::RelaDyn->addReloc(
{Target->RelativeRel, &C, RI.r_offset, true, &Body, Addend});
continue;
}
const Elf_Sym &Sym = cast<LocalSymbol<ELFT>>(Body).Sym;
InputSectionBase<ELFT> *Section = File.getSection(Sym);
uintX_t Offset = Sym.st_value;
if (Sym.getType() == STT_SECTION) {
Offset += Addend;
Addend = 0;
}
Out<ELFT>::RelaDyn->addReloc(
{Target->RelativeRel, &C, RI.r_offset, Section, Offset, Addend});
{Target->RelativeRel, &C, RI.r_offset, true, &Body, Addend});
}
}