From 18f084ff625a5de7417f5afa7d2da32da55e1972 Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Wed, 20 Jul 2016 19:36:41 +0000 Subject: [PATCH] Function names should start with lowercase letters. llvm-svn: 276165 --- lld/ELF/LinkerScript.cpp | 20 ++++++++++---------- lld/ELF/Writer.cpp | 22 +++++++++++----------- lld/ELF/Writer.h | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp index 1b91368..9240e9d 100644 --- a/lld/ELF/LinkerScript.cpp +++ b/lld/ELF/LinkerScript.cpp @@ -330,19 +330,19 @@ LinkerScript::createPhdrs(ArrayRef *> Sections) { Phdr &Added = Phdrs.back(); if (Cmd.HasFilehdr) - Added.AddSec(Out::ElfHeader); + Added.add(Out::ElfHeader); if (Cmd.HasPhdrs) - Added.AddSec(Out::ProgramHeaders); + Added.add(Out::ProgramHeaders); switch (Cmd.Type) { case PT_INTERP: if (needsInterpSection()) - Added.AddSec(Out::Interp); + Added.add(Out::Interp); break; case PT_DYNAMIC: if (isOutputDynamic()) { Added.H.p_flags = toPhdrFlags(Out::Dynamic->getFlags()); - Added.AddSec(Out::Dynamic); + Added.add(Out::Dynamic); } break; case PT_TLS: @@ -357,7 +357,7 @@ LinkerScript::createPhdrs(ArrayRef *> Sections) { case PT_GNU_EH_FRAME: if (!Out::EhFrame->empty() && Out::EhFrameHdr) { Added.H.p_flags = toPhdrFlags(Out::EhFrameHdr->getFlags()); - Added.AddSec(Out::EhFrameHdr); + Added.add(Out::EhFrameHdr); } break; } @@ -368,7 +368,7 @@ LinkerScript::createPhdrs(ArrayRef *> Sections) { break; if (TlsNum != -1 && (Sec->getFlags() & SHF_TLS)) - Phdrs[TlsNum].AddSec(Sec); + Phdrs[TlsNum].add(Sec); if (!needsPtLoad(Sec)) continue; @@ -378,7 +378,7 @@ LinkerScript::createPhdrs(ArrayRef *> Sections) { if (!PhdrIds.empty()) { // Assign headers specified by linker script for (size_t Id : PhdrIds) { - Phdrs[Id].AddSec(Sec); + Phdrs[Id].add(Sec); Phdrs[Id].H.p_flags |= toPhdrFlags(Sec->getFlags()); } } else { @@ -389,13 +389,13 @@ LinkerScript::createPhdrs(ArrayRef *> Sections) { Load = &*Phdrs.emplace(Phdrs.end(), PT_LOAD, NewFlags); Flags = NewFlags; } - Load->AddSec(Sec); + Load->add(Sec); } if (RelroNum != -1 && isRelroSection(Sec)) - Phdrs[RelroNum].AddSec(Sec); + Phdrs[RelroNum].add(Sec); if (NoteNum != -1 && Sec->getType() == SHT_NOTE) - Phdrs[NoteNum].AddSec(Sec); + Phdrs[NoteNum].add(Sec); } return Phdrs; } diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp index 63489cc..764699f 100644 --- a/lld/ELF/Writer.cpp +++ b/lld/ELF/Writer.cpp @@ -496,7 +496,7 @@ PhdrEntry::PhdrEntry(unsigned Type, unsigned Flags) { } template -void PhdrEntry::AddSec(OutputSectionBase *Sec) { +void PhdrEntry::add(OutputSectionBase *Sec) { Last = Sec; if (!First) First = Sec; @@ -959,19 +959,19 @@ std::vector> Writer::createPhdrs() { // The first phdr entry is PT_PHDR which describes the program header itself. Phdr &Hdr = *AddHdr(PT_PHDR, PF_R); - Hdr.AddSec(Out::ProgramHeaders); + Hdr.add(Out::ProgramHeaders); // PT_INTERP must be the second entry if exists. if (needsInterpSection()) { Phdr &Hdr = *AddHdr(PT_INTERP, toPhdrFlags(Out::Interp->getFlags())); - Hdr.AddSec(Out::Interp); + Hdr.add(Out::Interp); } // Add the first PT_LOAD segment for regular output sections. uintX_t Flags = PF_R; Phdr *Load = AddHdr(PT_LOAD, Flags); - Load->AddSec(Out::ElfHeader); - Load->AddSec(Out::ProgramHeaders); + Load->add(Out::ElfHeader); + Load->add(Out::ProgramHeaders); Phdr TlsHdr(PT_TLS, PF_R); Phdr RelRo(PT_GNU_RELRO, PF_R); @@ -984,7 +984,7 @@ std::vector> Writer::createPhdrs() { // and put all TLS sections inside for futher use when // assign addresses. if (Sec->getFlags() & SHF_TLS) - TlsHdr.AddSec(Sec); + TlsHdr.add(Sec); if (!needsPtLoad(Sec)) continue; @@ -996,12 +996,12 @@ std::vector> Writer::createPhdrs() { Flags = NewFlags; } - Load->AddSec(Sec); + Load->add(Sec); if (isRelroSection(Sec)) - RelRo.AddSec(Sec); + RelRo.add(Sec); if (Sec->getType() == SHT_NOTE) - Note.AddSec(Sec); + Note.add(Sec); } // Add the TLS segment unless it's empty. @@ -1011,7 +1011,7 @@ std::vector> Writer::createPhdrs() { // Add an entry for .dynamic. if (isOutputDynamic()) { Phdr &H = *AddHdr(PT_DYNAMIC, toPhdrFlags(Out::Dynamic->getFlags())); - H.AddSec(Out::Dynamic); + H.add(Out::Dynamic); } // PT_GNU_RELRO includes all sections that should be marked as @@ -1023,7 +1023,7 @@ std::vector> Writer::createPhdrs() { if (!Out::EhFrame->empty() && Out::EhFrameHdr) { Phdr &Hdr = *AddHdr(PT_GNU_EH_FRAME, toPhdrFlags(Out::EhFrameHdr->getFlags())); - Hdr.AddSec(Out::EhFrameHdr); + Hdr.add(Out::EhFrameHdr); } // PT_GNU_STACK is a special section to tell the loader to make the diff --git a/lld/ELF/Writer.h b/lld/ELF/Writer.h index 256d74b..6ded7c6 100644 --- a/lld/ELF/Writer.h +++ b/lld/ELF/Writer.h @@ -37,7 +37,7 @@ uint32_t toPhdrFlags(uint64_t Flags); template struct PhdrEntry { PhdrEntry(unsigned Type, unsigned Flags); - void AddSec(OutputSectionBase *Sec); + void add(OutputSectionBase *Sec); typename ELFT::Phdr H = {}; OutputSectionBase *First = nullptr; -- 2.7.4