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

[ELF/Linkerscript] Remove special handling of TLS/NOTE/RELRO sections (patch from ruiu) 

llvm-svn: 276731
This commit is contained in:
Eugene Leviant 2016-07-26 07:20:40 +00:00
parent fae1cf40bb
commit f9d897c7a7
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lld/ELF/LinkerScript.cpp
View File

@ -256,9 +256,6 @@ template <class ELFT>
std::vector<PhdrEntry<ELFT>>
LinkerScript<ELFT>::createPhdrs(ArrayRef<OutputSectionBase<ELFT> *> Sections) {
std::vector<PhdrEntry<ELFT>> Ret;
PhdrEntry<ELFT> *TlsPhdr = nullptr;
PhdrEntry<ELFT> *NotePhdr = nullptr;
PhdrEntry<ELFT> *RelroPhdr = nullptr;
for (const PhdrsCommand &Cmd : Opt.PhdrsCommands) {
Ret.emplace_back(Cmd.Type, Cmd.Flags == UINT_MAX ? PF_R : Cmd.Flags);
@ -280,15 +277,6 @@ LinkerScript<ELFT>::createPhdrs(ArrayRef<OutputSectionBase<ELFT> *> Sections) {
Phdr.add(Out<ELFT>::Dynamic);
}
break;
case PT_TLS:
TlsPhdr = &Phdr;
break;
case PT_NOTE:
NotePhdr = &Phdr;
break;
case PT_GNU_RELRO:
RelroPhdr = &Phdr;
break;
case PT_GNU_EH_FRAME:
if (!Out<ELFT>::EhFrame->empty() && Out<ELFT>::EhFrameHdr) {
Phdr.H.p_flags = toPhdrFlags(Out<ELFT>::EhFrameHdr->getFlags());
@ -304,12 +292,6 @@ LinkerScript<ELFT>::createPhdrs(ArrayRef<OutputSectionBase<ELFT> *> Sections) {
if (!(Sec->getFlags() & SHF_ALLOC))
break;
if (TlsPhdr && (Sec->getFlags() & SHF_TLS))
TlsPhdr->add(Sec);
if (!needsPtLoad<ELFT>(Sec))
continue;
std::vector<size_t> PhdrIds = getPhdrIndices(Sec->getName());
if (!PhdrIds.empty()) {
// Assign headers specified by linker script
@ -328,11 +310,6 @@ LinkerScript<ELFT>::createPhdrs(ArrayRef<OutputSectionBase<ELFT> *> Sections) {
}
Load->add(Sec);
}
if (RelroPhdr && isRelroSection(Sec))
RelroPhdr->add(Sec);
if (NotePhdr && Sec->getType() == SHT_NOTE)
NotePhdr->add(Sec);
}
return Ret;
}