RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-21 20:12:56 +02:00
Code Issues Projects Releases Wiki Activity

[llvm-objcopy] NFC: consistently use typename ELFT::<X> definitions in headers

Browse Source 
llvm-svn: 339448
This commit is contained in:
Jordan Rupprecht 2018-08-10 16:25:58 +00:00
parent 24d67025bb
commit 1e68cbea64
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/llvm-objcopy/Object.cpp
View File

@ -63,8 +63,6 @@ std::unique_ptr<WritableMemoryBuffer> MemBuffer::releaseMemoryBuffer() {
}
template <class ELFT> void ELFWriter<ELFT>::writePhdr(const Segment &Seg) {
using Elf_Phdr = typename ELFT::Phdr;
uint8_t *B = Buf.getBufferStart();
B += Obj.ProgramHdrSegment.Offset + Seg.Index * sizeof(Elf_Phdr);
Elf_Phdr &Phdr = *reinterpret_cast<Elf_Phdr *>(B);
@ -87,7 +85,7 @@ void SectionBase::markSymbols() {}
template <class ELFT> void ELFWriter<ELFT>::writeShdr(const SectionBase &Sec) {
uint8_t *B = Buf.getBufferStart();
B += Sec.HeaderOffset;
typename ELFT::Shdr &Shdr = *reinterpret_cast<typename ELFT::Shdr *>(B);
Elf_Shdr &Shdr = *reinterpret_cast<Elf_Shdr *>(B);
Shdr.sh_name = Sec.NameIndex;
Shdr.sh_type = Sec.Type;
Shdr.sh_flags = Sec.Flags;
@ -162,7 +160,7 @@ void StringTableSection::accept(SectionVisitor &Visitor) const {
template <class ELFT>
void ELFSectionWriter<ELFT>::visit(const SectionIndexSection &Sec) {
uint8_t *Buf = Out.getBufferStart() + Sec.Offset;
auto *IndexesBuffer = reinterpret_cast<typename ELFT::Word *>(Buf);
auto *IndexesBuffer = reinterpret_cast<Elf_Word *>(Buf);
std::copy(std::begin(Sec.Indexes), std::end(Sec.Indexes), IndexesBuffer);
}
@ -344,7 +342,7 @@ template <class ELFT>
void ELFSectionWriter<ELFT>::visit(const SymbolTableSection &Sec) {
uint8_t *Buf = Out.getBufferStart();
Buf += Sec.Offset;
typename ELFT::Sym *Sym = reinterpret_cast<typename ELFT::Sym *>(Buf);
Elf_Sym *Sym = reinterpret_cast<Elf_Sym *>(Buf);
// Loop though symbols setting each entry of the symbol table.
for (auto &Symbol : Sec.Symbols) {
Sym->st_name = Symbol->NameIndex;
@ -1193,7 +1191,7 @@ template <class ELFT> void ELFWriter<ELFT>::assignOffsets() {
// If we need to write the section header table out then we need to align the
// Offset so that SHOffset is valid.
if (WriteSectionHeaders)
Offset = alignTo(Offset, sizeof(typename ELFT::Addr));
Offset = alignTo(Offset, sizeof(Elf_Addr));
Obj.SHOffset = Offset;
}

2
tools/llvm-objcopy/Object.h
View File

@ -104,6 +104,7 @@ private:
using Elf_Word = typename ELFT::Word;
using Elf_Rel = typename ELFT::Rel;
using Elf_Rela = typename ELFT::Rela;
using Elf_Sym = typename ELFT::Sym;
public:
virtual ~ELFSectionWriter() {}
@ -190,6 +191,7 @@ public:
template <class ELFT> class ELFWriter : public Writer {
private:
using Elf_Addr = typename ELFT::Addr;
using Elf_Shdr = typename ELFT::Shdr;
using Elf_Phdr = typename ELFT::Phdr;
using Elf_Ehdr = typename ELFT::Ehdr;