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

Fix build breakage.

Browse Source 
We cannot have MipsRldMap class and In<ELFT>::MipsRldMap.
Renamed the class.

llvm-svn: 287683
This commit is contained in:
Rui Ueyama
2016-11-22 19:24:52 +00:00
parent bae595b742
commit bdfa155fa2
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lld/ELF/SyntheticSections.cpp
View File

@@ -1657,12 +1657,11 @@ template <class ELFT> size_t VersionNeedSection<ELFT>::getSize() const {
}
template <class ELFT>
MipsRldMap<ELFT>::MipsRldMap()
MipsRldMapSection<ELFT>::MipsRldMapSection()
: SyntheticSection<ELFT>(SHF_ALLOC | SHF_WRITE, SHT_PROGBITS,
sizeof(typename ELFT::uint), ".rld_map") {}
template <class ELFT> void MipsRldMap<ELFT>::writeTo(uint8_t *Buf) {
template <class ELFT> void MipsRldMapSection<ELFT>::writeTo(uint8_t *Buf) {
// Apply filler from linker script.
uint64_t Filler = Script<ELFT>::X->getFiller(this->Name);
Filler = (Filler << 32) | Filler;
@@ -1779,7 +1778,7 @@ template class elf::VersionDefinitionSection<ELF32BE>;
template class elf::VersionDefinitionSection<ELF64LE>;
template class elf::VersionDefinitionSection<ELF64BE>;
template class elf::MipsRldMap<ELF32LE>;
template class elf::MipsRldMap<ELF32BE>;
template class elf::MipsRldMap<ELF64LE>;
template class elf::MipsRldMap<ELF64BE>;
template class elf::MipsRldMapSection<ELF32LE>;
template class elf::MipsRldMapSection<ELF32BE>;
template class elf::MipsRldMapSection<ELF64LE>;
template class elf::MipsRldMapSection<ELF64BE>;

8
lld/ELF/SyntheticSections.h
View File

@@ -603,9 +603,9 @@ private:
// of executable file which is pointed to by the DT_MIPS_RLD_MAP entry.
// See "Dynamic section" in Chapter 5 in the following document:
// ftp://www.linux-mips.org/pub/linux/mips/doc/ABI/mipsabi.pdf
template <class ELFT> class MipsRldMap : public SyntheticSection<ELFT> {
template <class ELFT> class MipsRldMapSection : public SyntheticSection<ELFT> {
public:
MipsRldMap();
MipsRldMapSection();
size_t getSize() const override { return sizeof(typename ELFT::uint); }
void writeTo(uint8_t *Buf) override;
};
@@ -629,7 +629,7 @@ template <class ELFT> struct In {
static GotPltSection<ELFT> *GotPlt;
static HashTableSection<ELFT> *HashTab;
static InputSection<ELFT> *Interp;
static MipsRldMap<ELFT> *MipsRldMap;
static MipsRldMapSection<ELFT> *MipsRldMap;
static PltSection<ELFT> *Plt;
static RelocationSection<ELFT> *RelaDyn;
static RelocationSection<ELFT> *RelaPlt;
@@ -654,7 +654,7 @@ template <class ELFT> MipsGotSection<ELFT> *In<ELFT>::MipsGot;
template <class ELFT> GotPltSection<ELFT> *In<ELFT>::GotPlt;
template <class ELFT> HashTableSection<ELFT> *In<ELFT>::HashTab;
template <class ELFT> InputSection<ELFT> *In<ELFT>::Interp;
template <class ELFT> MipsRldMap<ELFT> *In<ELFT>::MipsRldMap;
template <class ELFT> MipsRldMapSection<ELFT> *In<ELFT>::MipsRldMap;
template <class ELFT> PltSection<ELFT> *In<ELFT>::Plt;
template <class ELFT> RelocationSection<ELFT> *In<ELFT>::RelaDyn;
template <class ELFT> RelocationSection<ELFT> *In<ELFT>::RelaPlt;

2
lld/ELF/Writer.cpp
View File

@@ -298,7 +298,7 @@ template <class ELFT> void Writer<ELFT>::createSyntheticSections() {
// Add MIPS-specific sections.
if (Config->EMachine == EM_MIPS) {
if (!Config->Shared && In<ELFT>::DynSymTab) {
In<ELFT>::MipsRldMap = make<MipsRldMap<ELFT>>();
In<ELFT>::MipsRldMap = make<MipsRldMapSection<ELFT>>();
Symtab<ELFT>::X->Sections.push_back(In<ELFT>::MipsRldMap);
}
if (auto *Sec = MipsAbiFlagsSection<ELFT>::create())