diff options
| author | Fangrui Song <maskray@google.com> | 2019-10-07 08:31:18 +0000 |
|---|---|---|
| committer | Fangrui Song <maskray@google.com> | 2019-10-07 08:31:18 +0000 |
| commit | bd8cfe65f5fee4ad573adc2172359c9552e8cdc0 (patch) | |
| tree | 120e3c545ba0335d1d5ef438a2fad4a00ff70244 /lld/ELF/OutputSections.cpp | |
| parent | 5761e3cef42fb188453253f9e0793542ec7a2eae (diff) | |
| download | bcm5719-llvm-bd8cfe65f5fee4ad573adc2172359c9552e8cdc0.tar.gz bcm5719-llvm-bd8cfe65f5fee4ad573adc2172359c9552e8cdc0.zip | |
[ELF] Wrap things in `namespace lld { namespace elf {`, NFC
This makes it clear `ELF/**/*.cpp` files define things in the `lld::elf`
namespace and simplifies `elf::foo` to `foo`.
Reviewed By: atanasyan, grimar, ruiu
Differential Revision: https://reviews.llvm.org/D68323
llvm-svn: 373885
Diffstat (limited to 'lld/ELF/OutputSections.cpp')
| -rw-r--r-- | lld/ELF/OutputSections.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lld/ELF/OutputSections.cpp b/lld/ELF/OutputSections.cpp index d6164103867..ea7c96eb676 100644 --- a/lld/ELF/OutputSections.cpp +++ b/lld/ELF/OutputSections.cpp @@ -27,9 +27,8 @@ using namespace llvm::object; using namespace llvm::support::endian; using namespace llvm::ELF; -using namespace lld; -using namespace lld::elf; - +namespace lld { +namespace elf { uint8_t *Out::bufferStart; uint8_t Out::first; PhdrEntry *Out::tlsPhdr; @@ -39,7 +38,7 @@ OutputSection *Out::preinitArray; OutputSection *Out::initArray; OutputSection *Out::finiArray; -std::vector<OutputSection *> elf::outputSections; +std::vector<OutputSection *> outputSections; uint32_t OutputSection::getPhdrFlags() const { uint32_t ret = 0; @@ -226,7 +225,7 @@ static void sortByOrder(MutableArrayRef<InputSection *> in, in[i] = v[i].second; } -uint64_t elf::getHeaderSize() { +uint64_t getHeaderSize() { if (config->oFormatBinary) return 0; return Out::elfHeader->size + Out::programHeaders->size; @@ -446,7 +445,7 @@ void OutputSection::sortCtorsDtors() { // If an input string is in the form of "foo.N" where N is a number, // return N. Otherwise, returns 65536, which is one greater than the // lowest priority. -int elf::getPriority(StringRef s) { +int getPriority(StringRef s) { size_t pos = s.rfind('.'); if (pos == StringRef::npos) return 65536; @@ -456,7 +455,7 @@ int elf::getPriority(StringRef s) { return v; } -std::vector<InputSection *> elf::getInputSections(OutputSection *os) { +std::vector<InputSection *> getInputSections(OutputSection *os) { std::vector<InputSection *> ret; for (BaseCommand *base : os->sectionCommands) if (auto *isd = dyn_cast<InputSectionDescription>(base)) @@ -497,3 +496,6 @@ template void OutputSection::maybeCompress<ELF32LE>(); template void OutputSection::maybeCompress<ELF32BE>(); template void OutputSection::maybeCompress<ELF64LE>(); template void OutputSection::maybeCompress<ELF64BE>(); + +} // namespace elf +} // namespace lld |

