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

[ELF] Use namespace qualifiers (lld:: or elf::) instead of `namespace lld { namespace elf {` 

Similar to D74882. This reverts much code from commit
bd8cfe65f5 (D68323) and fixes some
problems before D68323.

Sorry for the churn but D68323 was a mistake. Namespace qualifiers avoid
bugs where the definition does not match the declaration from the
header. See
https://llvm.org/docs/CodingStandards.html#use-namespace-qualifiers-to-implement-previously-declared-functions (D74515)

Differential Revision: https://reviews.llvm.org/D79982
This commit is contained in:
Fangrui Song 2020-05-14 22:18:58 -07:00
parent 04c89c7fca
commit 07837b8f49
39 changed files with 307 additions and 438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lld/ELF/AArch64ErrataFix.cpp
View File

@ -44,9 +44,8 @@ using namespace llvm::ELF;
using namespace llvm::object;
using namespace llvm::support;
using namespace llvm::support::endian;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
// Helper functions to identify instructions and conditions needed to trigger
// the Cortex-A53-843419 erratum.
@ -371,7 +370,7 @@ static uint64_t scanCortexA53Errata843419(InputSection *isec, uint64_t &off,
return patchOff;
}
class Patch843419Section : public SyntheticSection {
class elf::Patch843419Section : public SyntheticSection {
public:
Patch843419Section(InputSection *p, uint64_t off);
@ -645,5 +644,3 @@ bool AArch64Err843419Patcher::createFixes() {
}
return addressesChanged;
}
} // namespace elf
} // namespace lld

10
lld/ELF/ARMErrataFix.cpp
View File

@ -33,9 +33,8 @@ using namespace llvm::ELF;
using namespace llvm::object;
using namespace llvm::support;
using namespace llvm::support::endian;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
// The documented title for Erratum 657417 is:
// "A 32bit branch instruction that spans two 4K regions can result in an
@ -71,7 +70,7 @@ namespace elf {
// 00001002 2 - bytes padding
// 00001004 __CortexA8657417_00000FFE: B.w func
class Patch657417Section : public SyntheticSection {
class elf::Patch657417Section : public SyntheticSection {
public:
Patch657417Section(InputSection *p, uint64_t off, uint32_t instr, bool isARM);
@ -527,6 +526,3 @@ bool ARMErr657417Patcher::createFixes() {
}
return addressesChanged;
}
} // namespace elf
} // namespace lld

12
lld/ELF/Arch/AArch64.cpp
View File

@ -17,14 +17,13 @@
using namespace llvm;
using namespace llvm::support::endian;
using namespace llvm::ELF;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
// Page(Expr) is the page address of the expression Expr, defined
// as (Expr & ~0xFFF). (This applies even if the machine page size
// supported by the platform has a different value.)
uint64_t getAArch64Page(uint64_t expr) {
uint64_t elf::getAArch64Page(uint64_t expr) {
return expr & ~static_cast<uint64_t>(0xFFF);
}
@ -698,7 +697,4 @@ static TargetInfo *getTargetInfo() {
return &t;
}
TargetInfo *getAArch64TargetInfo() { return getTargetInfo(); }
} // namespace elf
} // namespace lld
TargetInfo *elf::getAArch64TargetInfo() { return getTargetInfo(); }

10
lld/ELF/Arch/AMDGPU.cpp
View File

@ -17,9 +17,8 @@ using namespace llvm;
using namespace llvm::object;
using namespace llvm::support::endian;
using namespace llvm::ELF;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
namespace {
class AMDGPU final : public TargetInfo {
@ -109,10 +108,7 @@ RelType AMDGPU::getDynRel(RelType type) const {
return R_AMDGPU_NONE;
}
TargetInfo *getAMDGPUTargetInfo() {
TargetInfo *elf::getAMDGPUTargetInfo() {
static AMDGPU target;
return &target;
}
} // namespace elf
} // namespace lld

10
lld/ELF/Arch/ARM.cpp
View File

@ -18,9 +18,8 @@
using namespace llvm;
using namespace llvm::support::endian;
using namespace llvm::ELF;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
namespace {
class ARM final : public TargetInfo {
@ -845,10 +844,7 @@ int64_t ARM::getImplicitAddend(const uint8_t *buf, RelType type) const {
}
}
TargetInfo *getARMTargetInfo() {
TargetInfo *elf::getARMTargetInfo() {
static ARM target;
return &target;
}
} // namespace elf
} // namespace lld

10
lld/ELF/Arch/AVR.cpp
View File

@ -36,9 +36,8 @@ using namespace llvm;
using namespace llvm::object;
using namespace llvm::support::endian;
using namespace llvm::ELF;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
namespace {
class AVR final : public TargetInfo {
@ -73,10 +72,7 @@ void AVR::relocate(uint8_t *loc, const Relocation &rel, uint64_t val) const {
}
}
TargetInfo *getAVRTargetInfo() {
TargetInfo *elf::getAVRTargetInfo() {
static AVR target;
return &target;
}
} // namespace elf
} // namespace lld

10
lld/ELF/Arch/Hexagon.cpp
View File

@ -19,9 +19,8 @@ using namespace llvm;
using namespace llvm::object;
using namespace llvm::support::endian;
using namespace llvm::ELF;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
namespace {
class Hexagon final : public TargetInfo {
@ -386,10 +385,7 @@ RelType Hexagon::getDynRel(RelType type) const {
return R_HEX_NONE;
}
TargetInfo *getHexagonTargetInfo() {
TargetInfo *elf::getHexagonTargetInfo() {
static Hexagon target;
return &target;
}
} // namespace elf
} // namespace lld

10
lld/ELF/Arch/MSP430.cpp
View File

@ -26,9 +26,8 @@ using namespace llvm;
using namespace llvm::object;
using namespace llvm::support::endian;
using namespace llvm::ELF;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
namespace {
class MSP430 final : public TargetInfo {
@ -90,10 +89,7 @@ void MSP430::relocate(uint8_t *loc, const Relocation &rel, uint64_t val) const {
}
}
TargetInfo *getMSP430TargetInfo() {
TargetInfo *elf::getMSP430TargetInfo() {
static MSP430 target;
return &target;
}
} // namespace elf
} // namespace lld

27
lld/ELF/Arch/Mips.cpp
View File

@ -18,9 +18,9 @@
using namespace llvm;
using namespace llvm::object;
using namespace llvm::ELF;
using namespace lld;
using namespace lld::elf;
namespace lld {
namespace elf {
namespace {
template <class ELFT> class MIPS final : public TargetInfo {
public:
@ -734,7 +734,7 @@ template <class ELFT> bool MIPS<ELFT>::usesOnlyLowPageBits(RelType type) const {
}
// Return true if the symbol is a PIC function.
template <class ELFT> bool isMipsPIC(const Defined *sym) {
template <class ELFT> bool elf::isMipsPIC(const Defined *sym) {
if (!sym->isFunc())
return false;
@ -752,20 +752,17 @@ template <class ELFT> bool isMipsPIC(const Defined *sym) {
return file->getObj().getHeader()->e_flags & EF_MIPS_PIC;
}
template <class ELFT> TargetInfo *getMipsTargetInfo() {
template <class ELFT> TargetInfo *elf::getMipsTargetInfo() {
static MIPS<ELFT> target;
return &target;
}
template TargetInfo *getMipsTargetInfo<ELF32LE>();
template TargetInfo *getMipsTargetInfo<ELF32BE>();
template TargetInfo *getMipsTargetInfo<ELF64LE>();
template TargetInfo *getMipsTargetInfo<ELF64BE>();
template TargetInfo *elf::getMipsTargetInfo<ELF32LE>();
template TargetInfo *elf::getMipsTargetInfo<ELF32BE>();
template TargetInfo *elf::getMipsTargetInfo<ELF64LE>();
template TargetInfo *elf::getMipsTargetInfo<ELF64BE>();
template bool isMipsPIC<ELF32LE>(const Defined *);
template bool isMipsPIC<ELF32BE>(const Defined *);
template bool isMipsPIC<ELF64LE>(const Defined *);
template bool isMipsPIC<ELF64BE>(const Defined *);
} // namespace elf
} // namespace lld
template bool elf::isMipsPIC<ELF32LE>(const Defined *);
template bool elf::isMipsPIC<ELF32BE>(const Defined *);
template bool elf::isMipsPIC<ELF64LE>(const Defined *);
template bool elf::isMipsPIC<ELF64BE>(const Defined *);

26
lld/ELF/Arch/MipsArchTree.cpp
View File

@ -23,8 +23,8 @@ using namespace llvm;
using namespace llvm::object;
using namespace llvm::ELF;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
namespace {
struct ArchTreeEdge {
@ -294,7 +294,7 @@ static uint32_t getArchFlags(ArrayRef<FileFlags> files) {
return ret;
}
template <class ELFT> uint32_t calcMipsEFlags() {
template <class ELFT> uint32_t elf::calcMipsEFlags() {
std::vector<FileFlags> v;
for (InputFile *f : objectFiles)
v.push_back({f, cast<ObjFile<ELFT>>(f)->getObj().getHeader()->e_flags});
@ -350,7 +350,8 @@ static StringRef getMipsFpAbiName(uint8_t fpAbi) {
}
}
uint8_t getMipsFpAbiFlag(uint8_t oldFlag, uint8_t newFlag, StringRef fileName) {
uint8_t elf::getMipsFpAbiFlag(uint8_t oldFlag, uint8_t newFlag,
StringRef fileName) {
if (compareMipsFpAbi(newFlag, oldFlag) >= 0)
return newFlag;
if (compareMipsFpAbi(oldFlag, newFlag) < 0)
@ -366,7 +367,7 @@ template <class ELFT> static bool isN32Abi(const InputFile *f) {
return false;
}
bool isMipsN32Abi(const InputFile *f) {
bool elf::isMipsN32Abi(const InputFile *f) {
switch (config->ekind) {
case ELF32LEKind:
return isN32Abi<ELF32LE>(f);
@ -381,17 +382,14 @@ bool isMipsN32Abi(const InputFile *f) {
}
}
bool isMicroMips() { return config->eflags & EF_MIPS_MICROMIPS; }
bool elf::isMicroMips() { return config->eflags & EF_MIPS_MICROMIPS; }
bool isMipsR6() {
bool elf::isMipsR6() {
uint32_t arch = config->eflags & EF_MIPS_ARCH;
return arch == EF_MIPS_ARCH_32R6 || arch == EF_MIPS_ARCH_64R6;
}
template uint32_t calcMipsEFlags<ELF32LE>();
template uint32_t calcMipsEFlags<ELF32BE>();
template uint32_t calcMipsEFlags<ELF64LE>();
template uint32_t calcMipsEFlags<ELF64BE>();
} // namespace elf
} // namespace lld
template uint32_t elf::calcMipsEFlags<ELF32LE>();
template uint32_t elf::calcMipsEFlags<ELF32BE>();
template uint32_t elf::calcMipsEFlags<ELF64LE>();
template uint32_t elf::calcMipsEFlags<ELF64BE>();

12
lld/ELF/Arch/PPC.cpp
View File

@ -17,9 +17,8 @@
using namespace llvm;
using namespace llvm::support::endian;
using namespace llvm::ELF;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
namespace {
class PPC final : public TargetInfo {
@ -71,7 +70,7 @@ static void writeFromHalf16(uint8_t *loc, uint32_t insn) {
write32(config->isLE ? loc : loc - 2, insn);
}
void writePPC32GlinkSection(uint8_t *buf, size_t numEntries) {
void elf::writePPC32GlinkSection(uint8_t *buf, size_t numEntries) {
// Create canonical PLT entries for non-PIE code. Compilers don't generate
// non-GOT-non-PLT relocations referencing external functions for -fpie/-fPIE.
uint32_t glink = in.plt->getVA(); // VA of .glink
@ -468,10 +467,7 @@ void PPC::relaxTlsIeToLe(uint8_t *loc, const Relocation &rel,
}
}
TargetInfo *getPPCTargetInfo() {
TargetInfo *elf::getPPCTargetInfo() {
static PPC target;
return &target;
}
} // namespace elf
} // namespace lld

20
lld/ELF/Arch/PPC64.cpp
View File

@ -17,9 +17,8 @@ using namespace llvm;
using namespace llvm::object;
using namespace llvm::support::endian;
using namespace llvm::ELF;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
static uint64_t ppc64TocOffset = 0x8000;
static uint64_t dynamicThreadPointerOffset = 0x8000;
@ -61,7 +60,7 @@ enum DFormOpcd {
ADDI = 14
};
uint64_t getPPC64TocBase() {
uint64_t elf::getPPC64TocBase() {
// The TOC consists of sections .got, .toc, .tocbss, .plt in that order. The
// TOC starts where the first of these sections starts. We always create a
// .got when we see a relocation that uses it, so for us the start is always
@ -75,7 +74,7 @@ uint64_t getPPC64TocBase() {
return tocVA + ppc64TocOffset;
}
unsigned getPPC64GlobalEntryToLocalEntryOffset(uint8_t stOther) {
unsigned elf::getPPC64GlobalEntryToLocalEntryOffset(uint8_t stOther) {
// The offset is encoded into the 3 most significant bits of the st_other
// field, with some special values described in section 3.4.1 of the ABI:
// 0 --> Zero offset between the GEP and LEP, and the function does NOT use
@ -100,7 +99,7 @@ unsigned getPPC64GlobalEntryToLocalEntryOffset(uint8_t stOther) {
return 0;
}
bool isPPC64SmallCodeModelTocReloc(RelType type) {
bool elf::isPPC64SmallCodeModelTocReloc(RelType type) {
// The only small code model relocations that access the .toc section.
return type == R_PPC64_TOC16 || type == R_PPC64_TOC16_DS;
}
@ -155,7 +154,7 @@ getRelaTocSymAndAddend(InputSectionBase *tocSec, uint64_t offset) {
// ld/lwa 3, 0(3) # load the value from the address
//
// Returns true if the relaxation is performed.
bool tryRelaxPPC64TocIndirection(const Relocation &rel, uint8_t *bufLoc) {
bool elf::tryRelaxPPC64TocIndirection(const Relocation &rel, uint8_t *bufLoc) {
assert(config->tocOptimize);
if (rel.addend < 0)
return false;
@ -472,7 +471,7 @@ void PPC64::relaxTlsLdToLe(uint8_t *loc, const Relocation &rel,
}
}
unsigned getPPCDFormOp(unsigned secondaryOp) {
unsigned elf::getPPCDFormOp(unsigned secondaryOp) {
switch (secondaryOp) {
case LBZX:
return LBZ;
@ -1110,10 +1109,7 @@ bool PPC64::adjustPrologueForCrossSplitStack(uint8_t *loc, uint8_t *end,
return true;
}
TargetInfo *getPPC64TargetInfo() {
TargetInfo *elf::getPPC64TargetInfo() {
static PPC64 target;
return &target;
}
} // namespace elf
} // namespace lld

10
lld/ELF/Arch/RISCV.cpp
View File

@ -15,9 +15,8 @@ using namespace llvm;
using namespace llvm::object;
using namespace llvm::support::endian;
using namespace llvm::ELF;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
namespace {
@ -446,10 +445,7 @@ void RISCV::relocate(uint8_t *loc, const Relocation &rel, uint64_t val) const {
}
}
TargetInfo *getRISCVTargetInfo() {
TargetInfo *elf::getRISCVTargetInfo() {
static RISCV target;
return &target;
}
} // namespace elf
} // namespace lld

10
lld/ELF/Arch/SPARCV9.cpp
View File

@ -16,9 +16,8 @@
using namespace llvm;
using namespace llvm::support::endian;
using namespace llvm::ELF;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
namespace {
class SPARCV9 final : public TargetInfo {
@ -196,10 +195,7 @@ void SPARCV9::writePlt(uint8_t *buf, const Symbol & /*sym*/,
relocateNoSym(buf + 4, R_SPARC_WDISP19, -(off + 4 - pltEntrySize));
}
TargetInfo *getSPARCV9TargetInfo() {
TargetInfo *elf::getSPARCV9TargetInfo() {
static SPARCV9 target;
return &target;
}
} // namespace elf
} // namespace lld

10
lld/ELF/Arch/X86.cpp
View File

@ -16,9 +16,8 @@
using namespace llvm;
using namespace llvm::support::endian;
using namespace llvm::ELF;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
namespace {
class X86 : public TargetInfo {
@ -615,7 +614,7 @@ void RetpolineNoPic::writePlt(uint8_t *buf, const Symbol &sym,
write32le(buf + 22, -off - 26);
}
TargetInfo *getX86TargetInfo() {
TargetInfo *elf::getX86TargetInfo() {
if (config->zRetpolineplt) {
if (config->isPic) {
static RetpolinePic t;
@ -633,6 +632,3 @@ TargetInfo *getX86TargetInfo() {
static X86 t;
return &t;
}
} // namespace elf
} // namespace lld

10
lld/ELF/Arch/X86_64.cpp
View File

@ -19,9 +19,8 @@ using namespace llvm;
using namespace llvm::object;
using namespace llvm::support::endian;
using namespace llvm::ELF;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
namespace {
class X86_64 : public TargetInfo {
@ -1086,7 +1085,4 @@ static TargetInfo *getTargetInfo() {
return &t;
}
TargetInfo *getX86_64TargetInfo() { return getTargetInfo(); }
} // namespace elf
} // namespace lld
TargetInfo *elf::getX86_64TargetInfo() { return getTargetInfo(); }

10
lld/ELF/CallGraphSort.cpp
View File

@ -48,9 +48,8 @@
#include <numeric>
using namespace llvm;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
namespace {
struct Edge {
@ -265,9 +264,6 @@ DenseMap<const InputSectionBase *, int> CallGraphSort::run() {
// This first builds a call graph based on the profile data then merges sections
// according to the C³ heuristic. All clusters are then sorted by a density
// metric to further improve locality.
DenseMap<const InputSectionBase *, int> computeCallGraphProfileOrder() {
DenseMap<const InputSectionBase *, int> elf::computeCallGraphProfileOrder() {
return CallGraphSort().run();
}
} // namespace elf
} // namespace lld

15
lld/ELF/DWARF.cpp
View File

@ -22,9 +22,9 @@
using namespace llvm;
using namespace llvm::object;
using namespace lld;
using namespace lld::elf;
namespace lld {
namespace elf {
template <class ELFT> LLDDwarfObj<ELFT>::LLDDwarfObj(ObjFile<ELFT> *obj) {
for (InputSectionBase *sec : obj->getSections()) {
if (!sec)
@ -119,10 +119,7 @@ Optional<RelocAddrEntry> LLDDwarfObj<ELFT>::find(const llvm::DWARFSection &s,
return findAux(*sec.sec, pos, sec.sec->template rels<ELFT>());
}
template class LLDDwarfObj<ELF32LE>;
template class LLDDwarfObj<ELF32BE>;
template class LLDDwarfObj<ELF64LE>;
template class LLDDwarfObj<ELF64BE>;
} // namespace elf
} // namespace lld
template class elf::LLDDwarfObj<ELF32LE>;
template class elf::LLDDwarfObj<ELF32BE>;
template class elf::LLDDwarfObj<ELF64LE>;
template class elf::LLDDwarfObj<ELF64BE>;

16
lld/ELF/Driver.cpp
View File

@ -66,18 +66,17 @@ using namespace llvm::ELF;
using namespace llvm::object;
using namespace llvm::sys;
using namespace llvm::support;
using namespace lld;
using namespace lld::elf;
namespace lld {
namespace elf {
Configuration *config;
LinkerDriver *driver;
Configuration *elf::config;
LinkerDriver *elf::driver;
static void setConfigs(opt::InputArgList &args);
static void readConfigs(opt::InputArgList &args);
bool link(ArrayRef<const char *> args, bool canExitEarly, raw_ostream &stdoutOS,
raw_ostream &stderrOS) {
bool elf::link(ArrayRef<const char *> args, bool canExitEarly,
raw_ostream &stdoutOS, raw_ostream &stderrOS) {
lld::stdoutOS = &stdoutOS;
lld::stderrOS = &stderrOS;
@ -2096,6 +2095,3 @@ template <class ELFT> void LinkerDriver::link(opt::InputArgList &args) {
// Write the result to the file.
writeResult<ELFT>();
}
} // namespace elf
} // namespace lld

20
lld/ELF/DriverUtils.cpp
View File

@ -30,9 +30,8 @@
using namespace llvm;
using namespace llvm::sys;
using namespace llvm::opt;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
// Create OptTable
@ -144,7 +143,7 @@ opt::InputArgList ELFOptTable::parse(ArrayRef<const char *> argv) {
return args;
}
void printHelp() {
void elf::printHelp() {
ELFOptTable().PrintHelp(
lld::outs(), (config->progName + " [options] file...").str().c_str(),
"lld", false /*ShowHidden*/, true /*ShowAllAliases*/);
@ -166,7 +165,7 @@ static std::string rewritePath(StringRef s) {
// Reconstructs command line arguments so that so that you can re-run
// the same command with the same inputs. This is for --reproduce.
std::string createResponseFile(const opt::InputArgList &args) {
std::string elf::createResponseFile(const opt::InputArgList &args) {
SmallString<0> data;
raw_svector_ostream os(data);
os << "--chroot .\n";
@ -217,7 +216,7 @@ static Optional<std::string> findFile(StringRef path1, const Twine &path2) {
return None;
}
Optional<std::string> findFromSearchPaths(StringRef path) {
Optional<std::string> elf::findFromSearchPaths(StringRef path) {
for (StringRef dir : config->searchPaths)
if (Optional<std::string> s = findFile(dir, path))
return s;
@ -226,7 +225,7 @@ Optional<std::string> findFromSearchPaths(StringRef path) {
// This is for -l<basename>. We'll look for lib<basename>.so or lib<basename>.a from
// search paths.
Optional<std::string> searchLibraryBaseName(StringRef name) {
Optional<std::string> elf::searchLibraryBaseName(StringRef name) {
for (StringRef dir : config->searchPaths) {
if (!config->isStatic)
if (Optional<std::string> s = findFile(dir, "lib" + name + ".so"))
@ -238,7 +237,7 @@ Optional<std::string> searchLibraryBaseName(StringRef name) {
}
// This is for -l<namespec>.
Optional<std::string> searchLibrary(StringRef name) {
Optional<std::string> elf::searchLibrary(StringRef name) {
if (name.startswith(":"))
return findFromSearchPaths(name.substr(1));
return searchLibraryBaseName(name);
@ -247,11 +246,8 @@ Optional<std::string> searchLibrary(StringRef name) {
// If a linker/version script doesn't exist in the current directory, we also
// look for the script in the '-L' search paths. This matches the behaviour of
// '-T', --version-script=, and linker script INPUT() command in ld.bfd.
Optional<std::string> searchScript(StringRef name) {
Optional<std::string> elf::searchScript(StringRef name) {
if (fs::exists(name))
return name.str();
return findFromSearchPaths(name);
}
} // namespace elf
} // namespace lld

11
lld/ELF/EhFrame.cpp
View File

@ -29,9 +29,9 @@ using namespace llvm;
using namespace llvm::ELF;
using namespace llvm::dwarf;
using namespace llvm::object;
using namespace lld;
using namespace lld::elf;
namespace lld {
namespace elf {
namespace {
class EhReader {
public:
@ -56,7 +56,7 @@ private:
};
}
size_t readEhRecordSize(InputSectionBase *s, size_t off) {
size_t elf::readEhRecordSize(InputSectionBase *s, size_t off) {
return EhReader(s, s->data().slice(off)).readEhRecordSize();
}
@ -148,7 +148,7 @@ void EhReader::skipAugP() {
d = d.slice(size);
}
uint8_t getFdeEncoding(EhSectionPiece *p) {
uint8_t elf::getFdeEncoding(EhSectionPiece *p) {
return EhReader(p->sec, p->data()).getFdeEncoding();
}
@ -194,6 +194,3 @@ uint8_t EhReader::getFdeEncoding() {
}
return DW_EH_PE_absptr;
}
} // namespace elf
} // namespace lld

17
lld/ELF/ICF.cpp
View File

@ -92,9 +92,9 @@
using namespace llvm;
using namespace llvm::ELF;
using namespace llvm::object;
using namespace lld;
using namespace lld::elf;
namespace lld {
namespace elf {
namespace {
template <class ELFT> class ICF {
public:
@ -525,15 +525,12 @@ template <class ELFT> void ICF<ELFT>::run() {
}
// ICF entry point function.
template <class ELFT> void doIcf() {
template <class ELFT> void elf::doIcf() {
llvm::TimeTraceScope timeScope("ICF");
ICF<ELFT>().run();
}
template void doIcf<ELF32LE>();
template void doIcf<ELF32BE>();
template void doIcf<ELF64LE>();
template void doIcf<ELF64BE>();
} // namespace elf
} // namespace lld
template void elf::doIcf<ELF32LE>();
template void elf::doIcf<ELF32BE>();
template void elf::doIcf<ELF64LE>();
template void elf::doIcf<ELF64BE>();

48
lld/ELF/InputFiles.cpp
View File

@ -36,10 +36,23 @@ using namespace llvm::object;
using namespace llvm::sys;
using namespace llvm::sys::fs;
using namespace llvm::support::endian;
using namespace lld;
using namespace lld::elf;
bool InputFile::isInGroup;
uint32_t InputFile::nextGroupId;
std::vector<ArchiveFile *> elf::archiveFiles;
std::vector<BinaryFile *> elf::binaryFiles;
std::vector<BitcodeFile *> elf::bitcodeFiles;
std::vector<LazyObjFile *> elf::lazyObjFiles;
std::vector<InputFile *> elf::objectFiles;
std::vector<SharedFile *> elf::sharedFiles;
std::unique_ptr<TarWriter> elf::tar;
namespace lld {
// Returns "<internal>", "foo.a(bar.o)" or "baz.o".
std::string toString(const elf::InputFile *f) {
std::string lld::toString(const InputFile *f) {
if (!f)
return "<internal>";
@ -52,18 +65,6 @@ std::string toString(const elf::InputFile *f) {
return f->toStringCache;
}
namespace elf {
bool InputFile::isInGroup;
uint32_t InputFile::nextGroupId;
std::vector<ArchiveFile *> archiveFiles;
std::vector<BinaryFile *> binaryFiles;
std::vector<BitcodeFile *> bitcodeFiles;
std::vector<LazyObjFile *> lazyObjFiles;
std::vector<InputFile *> objectFiles;
std::vector<SharedFile *> sharedFiles;
std::unique_ptr<TarWriter> tar;
static ELFKind getELFKind(MemoryBufferRef mb, StringRef archiveName) {
unsigned char size;
unsigned char endian;
@ -102,7 +103,7 @@ InputFile::InputFile(Kind k, MemoryBufferRef m)
++nextGroupId;
}
Optional<MemoryBufferRef> readFile(StringRef path) {
Optional<MemoryBufferRef> elf::readFile(StringRef path) {
// The --chroot option changes our virtual root directory.
// This is useful when you are dealing with files created by --reproduce.
if (!config->chroot.empty() && path.startswith("/"))
@ -208,7 +209,7 @@ template <class ELFT> static void doParseFile(InputFile *file) {
}
// Add symbols in File to the symbol table.
void parseFile(InputFile *file) {
void elf::parseFile(InputFile *file) {
switch (config->ekind) {
case ELF32LEKind:
doParseFile<ELF32LE>(file);
@ -1542,7 +1543,7 @@ void BinaryFile::parse() {
STV_DEFAULT, STT_OBJECT, data.size(), 0, nullptr});
}
InputFile *createObjectFile(MemoryBufferRef mb, StringRef archiveName,
InputFile *elf::createObjectFile(MemoryBufferRef mb, StringRef archiveName,
uint64_t offsetInArchive) {
if (isBitcode(mb))
return make<BitcodeFile>(mb, archiveName, offsetInArchive);
@ -1634,7 +1635,7 @@ template <class ELFT> void LazyObjFile::parse() {
}
}
std::string replaceThinLTOSuffix(StringRef path) {
std::string elf::replaceThinLTOSuffix(StringRef path) {
StringRef suffix = config->thinLTOObjectSuffixReplace.first;
StringRef repl = config->thinLTOObjectSuffixReplace.second;
@ -1653,15 +1654,12 @@ template void LazyObjFile::parse<ELF32BE>();
template void LazyObjFile::parse<ELF64LE>();
template void LazyObjFile::parse<ELF64BE>();
template class ObjFile<ELF32LE>;
template class ObjFile<ELF32BE>;
template class ObjFile<ELF64LE>;
template class ObjFile<ELF64BE>;
template class elf::ObjFile<ELF32LE>;
template class elf::ObjFile<ELF32BE>;
template class elf::ObjFile<ELF64LE>;
template class elf::ObjFile<ELF64BE>;
template void SharedFile::parse<ELF32LE>();
template void SharedFile::parse<ELF32BE>();
template void SharedFile::parse<ELF64LE>();
template void SharedFile::parse<ELF64BE>();
} // namespace elf
} // namespace lld

2
lld/ELF/InputFiles.h
View File

@ -38,8 +38,6 @@ class DWARFCache;
std::string toString(const elf::InputFile *f);
namespace elf {
class InputFile;
class InputSectionBase;
using llvm::object::Archive;

17
lld/ELF/InputSection.cpp
View File

@ -36,17 +36,17 @@ using namespace llvm::object;
using namespace llvm::support;
using namespace llvm::support::endian;
using namespace llvm::sys;
using namespace lld;
using namespace lld::elf;
std::vector<InputSectionBase *> elf::inputSections;
DenseSet<std::pair<const Symbol *, uint64_t>> elf::ppc64noTocRelax;
namespace lld {
// Returns a string to construct an error message.
std::string toString(const elf::InputSectionBase *sec) {
std::string lld::toString(const InputSectionBase *sec) {
return (toString(sec->file) + ":(" + sec->name + ")").str();
}
namespace elf {
std::vector<InputSectionBase *> inputSections;
DenseSet<std::pair<const Symbol *, uint64_t>> ppc64noTocRelax;
template <class ELFT>
static ArrayRef<uint8_t> getSectionContents(ObjFile<ELFT> &file,
const typename ELFT::Shdr &hdr) {
@ -1137,7 +1137,7 @@ void InputSectionBase::adjustSplitStackFunctionPrologues(uint8_t *buf,
end, f->stOther))
continue;
if (!getFile<ELFT>()->someNoSplitStack)
error(toString(this) + ": " + f->getName() +
error(lld::toString(this) + ": " + f->getName() +
" (with -fsplit-stack) calls " + rel.sym->getName() +
" (without -fsplit-stack), but couldn't adjust its prologue");
}
@ -1400,6 +1400,3 @@ template void EhInputSection::split<ELF32LE>();
template void EhInputSection::split<ELF32BE>();
template void EhInputSection::split<ELF64LE>();
template void EhInputSection::split<ELF64BE>();
} // namespace elf
} // namespace lld

8
lld/ELF/LTO.cpp
View File

@ -41,9 +41,8 @@
using namespace llvm;
using namespace llvm::object;
using namespace llvm::ELF;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
// Creates an empty file to store a list of object files for final
// linking of distributed ThinLTO.
@ -351,6 +350,3 @@ std::vector<InputFile *> BitcodeCompiler::compile() {
ret.push_back(createObjectFile(*file));
return ret;
}
} // namespace elf
} // namespace lld

9
lld/ELF/LinkerScript.cpp
View File

@ -43,10 +43,10 @@ using namespace llvm;
using namespace llvm::ELF;
using namespace llvm::object;
using namespace llvm::support::endian;
using namespace lld;
using namespace lld::elf;
namespace lld {
namespace elf {
LinkerScript *script;
LinkerScript *elf::script;
static uint64_t getOutputSectionVA(SectionBase *sec) {
OutputSection *os = sec->getOutputSection();
@ -1247,6 +1247,3 @@ std::vector<size_t> LinkerScript::getPhdrIndices(OutputSection *cmd) {
}
return ret;
}
} // namespace elf
} // namespace lld

13
lld/ELF/MapFile.cpp
View File

@ -33,9 +33,9 @@
using namespace llvm;
using namespace llvm::object;
using namespace lld;
using namespace lld::elf;
namespace lld {
namespace elf {
using SymbolMapTy = DenseMap<const SectionBase *, SmallVector<Defined *, 4>>;
static constexpr char indent8[] = " "; // 8 spaces
@ -138,7 +138,7 @@ static void printEhFrame(raw_ostream &os, const EhFrameSection *sec) {
}
}
void writeMapFile() {
void elf::writeMapFile() {
if (config->mapFile.empty())
return;
@ -227,7 +227,7 @@ static void print(StringRef a, StringRef b) {
//
// In this case, strlen is defined by libc.so.6 and used by other two
// files.
void writeCrossReferenceTable() {
void elf::writeCrossReferenceTable() {
if (!config->cref)
return;
@ -259,7 +259,7 @@ void writeCrossReferenceTable() {
}
}
void writeArchiveStats() {
void elf::writeArchiveStats() {
if (config->printArchiveStats.empty())
return;
@ -276,6 +276,3 @@ void writeArchiveStats() {
os << f->getMemberCount() << '\t' << f->getFetchedMemberCount() << '\t'
<< f->getName() << '\n';
}
} // namespace elf
} // namespace lld

22
lld/ELF/MarkLive.cpp
View File

@ -38,11 +38,10 @@
using namespace llvm;
using namespace llvm::ELF;
using namespace llvm::object;
using namespace llvm::support::endian;
using namespace lld;
using namespace lld::elf;
namespace endian = llvm::support::endian;
namespace lld {
namespace elf {
namespace {
template <class ELFT> class MarkLive {
public:
@ -142,7 +141,7 @@ void MarkLive<ELFT>::scanEhFrameSection(EhInputSection &eh,
if (firstRelI == (unsigned)-1)
continue;
if (endian::read32<ELFT::TargetEndianness>(piece.data().data() + 4) == 0) {
if (read32<ELFT::TargetEndianness>(piece.data().data() + 4) == 0) {
// This is a CIE, we only need to worry about the first relocation. It is
// known to point to the personality function.
resolveReloc(eh, rels[firstRelI], false);
@ -323,7 +322,7 @@ template <class ELFT> void MarkLive<ELFT>::moveToMain() {
// Before calling this function, Live bits are off for all
// input sections. This function make some or all of them on
// so that they are emitted to the output file.
template <class ELFT> void markLive() {
template <class ELFT> void elf::markLive() {
llvm::TimeTraceScope timeScope("markLive");
// If -gc-sections is not given, no sections are removed.
if (!config->gcSections) {
@ -392,10 +391,7 @@ template <class ELFT> void markLive() {
message("removing unused section " + toString(sec));
}
template void markLive<ELF32LE>();
template void markLive<ELF32BE>();
template void markLive<ELF64LE>();
template void markLive<ELF64BE>();
} // namespace elf
} // namespace lld
template void elf::markLive<ELF32LE>();
template void elf::markLive<ELF32BE>();
template void elf::markLive<ELF64LE>();
template void elf::markLive<ELF64BE>();

17
lld/ELF/OutputSections.cpp
View File

@ -27,9 +27,9 @@ using namespace llvm::dwarf;
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 +39,7 @@ OutputSection *Out::preinitArray;
OutputSection *Out::initArray;
OutputSection *Out::finiArray;
std::vector<OutputSection *> outputSections;
std::vector<OutputSection *> elf::outputSections;
uint32_t OutputSection::getPhdrFlags() const {
uint32_t ret = 0;
@ -225,7 +225,7 @@ static void sortByOrder(MutableArrayRef<InputSection *> in,
in[i] = v[i].second;
}
uint64_t getHeaderSize() {
uint64_t elf::getHeaderSize() {
if (config->oFormatBinary)
return 0;
return Out::elfHeader->size + Out::programHeaders->size;
@ -478,7 +478,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 getPriority(StringRef s) {
int elf::getPriority(StringRef s) {
size_t pos = s.rfind('.');
if (pos == StringRef::npos)
return 65536;
@ -488,7 +488,7 @@ int getPriority(StringRef s) {
return v;
}
InputSection *getFirstInputSection(const OutputSection *os) {
InputSection *elf::getFirstInputSection(const OutputSection *os) {
for (BaseCommand *base : os->sectionCommands)
if (auto *isd = dyn_cast<InputSectionDescription>(base))
if (!isd->sections.empty())
@ -496,7 +496,7 @@ InputSection *getFirstInputSection(const OutputSection *os) {
return nullptr;
}
std::vector<InputSection *> getInputSections(const OutputSection *os) {
std::vector<InputSection *> elf::getInputSections(const OutputSection *os) {
std::vector<InputSection *> ret;
for (BaseCommand *base : os->sectionCommands)
if (auto *isd = dyn_cast<InputSectionDescription>(base))
@ -537,6 +537,3 @@ template void OutputSection::maybeCompress<ELF32LE>();
template void OutputSection::maybeCompress<ELF32BE>();
template void OutputSection::maybeCompress<ELF64LE>();
template void OutputSection::maybeCompress<ELF64BE>();
} // namespace elf
} // namespace lld

33
lld/ELF/Relocations.cpp
View File

@ -62,9 +62,9 @@ using namespace llvm;
using namespace llvm::ELF;
using namespace llvm::object;
using namespace llvm::support::endian;
using namespace lld;
using namespace lld::elf;
namespace lld {
namespace elf {
static Optional<std::string> getLinkerScriptLocation(const Symbol &sym) {
for (BaseCommand *base : script->sectionCommands)
if (auto *cmd = dyn_cast<SymbolAssignment>(base))
@ -96,7 +96,7 @@ static std::string getLocation(InputSectionBase &s, const Symbol &sym,
return msg + s.getObjMsg(off);
}
void reportRangeError(uint8_t *loc, const Relocation &rel, const Twine &v,
void elf::reportRangeError(uint8_t *loc, const Relocation &rel, const Twine &v,
int64_t min, uint64_t max) {
ErrorPlace errPlace = getErrorPlace(loc);
std::string hint;
@ -911,7 +911,7 @@ static void reportUndefinedSymbol(const UndefinedDiag &undef,
error(msg);
}
template <class ELFT> void reportUndefinedSymbols() {
template <class ELFT> void elf::reportUndefinedSymbols() {
// Find the first "undefined symbol" diagnostic for each diagnostic, and
// collect all "referenced from" lines at the first diagnostic.
DenseMap<Symbol *, UndefinedDiag *> firstRef;
@ -1514,7 +1514,7 @@ static void scanRelocs(InputSectionBase &sec, ArrayRef<RelTy> rels) {
});
}
template <class ELFT> void scanRelocations(InputSectionBase &s) {
template <class ELFT> void elf::scanRelocations(InputSectionBase &s) {
if (s.areRelocsRela)
scanRelocs<ELFT>(s, s.relas<ELFT>());
else
@ -1999,7 +1999,7 @@ bool ThunkCreator::createThunks(ArrayRef<OutputSection *> outputSections) {
// hexagonNeedsTLSSymbol scans for relocations would require a call to
// __tls_get_addr.
// hexagonTLSSymbolUpdate rebinds the relocation to __tls_get_addr.
bool hexagonNeedsTLSSymbol(ArrayRef<OutputSection *> outputSections) {
bool elf::hexagonNeedsTLSSymbol(ArrayRef<OutputSection *> outputSections) {
bool needTlsSymbol = false;
forEachInputSectionDescription(
outputSections, [&](OutputSection *os, InputSectionDescription *isd) {
@ -2013,7 +2013,7 @@ bool hexagonNeedsTLSSymbol(ArrayRef<OutputSection *> outputSections) {
return needTlsSymbol;
}
void hexagonTLSSymbolUpdate(ArrayRef<OutputSection *> outputSections) {
void elf::hexagonTLSSymbolUpdate(ArrayRef<OutputSection *> outputSections) {
Symbol *sym = symtab->find("__tls_get_addr");
if (!sym)
return;
@ -2033,14 +2033,11 @@ void hexagonTLSSymbolUpdate(ArrayRef<OutputSection *> outputSections) {
});
}
template void scanRelocations<ELF32LE>(InputSectionBase &);
template void scanRelocations<ELF32BE>(InputSectionBase &);
template void scanRelocations<ELF64LE>(InputSectionBase &);
template void scanRelocations<ELF64BE>(InputSectionBase &);
template void reportUndefinedSymbols<ELF32LE>();
template void reportUndefinedSymbols<ELF32BE>();
template void reportUndefinedSymbols<ELF64LE>();
template void reportUndefinedSymbols<ELF64BE>();
} // namespace elf
} // namespace lld
template void elf::scanRelocations<ELF32LE>(InputSectionBase &);
template void elf::scanRelocations<ELF32BE>(InputSectionBase &);
template void elf::scanRelocations<ELF64LE>(InputSectionBase &);
template void elf::scanRelocations<ELF64BE>(InputSectionBase &);
template void elf::reportUndefinedSymbols<ELF32LE>();
template void elf::reportUndefinedSymbols<ELF32BE>();
template void elf::reportUndefinedSymbols<ELF64LE>();
template void elf::reportUndefinedSymbols<ELF64BE>();

7
lld/ELF/ScriptLexer.cpp
View File

@ -36,9 +36,9 @@
#include "llvm/ADT/Twine.h"
using namespace llvm;
using namespace lld;
using namespace lld::elf;
namespace lld {
namespace elf {
// Returns a whole line containing the current token.
StringRef ScriptLexer::getLine() {
StringRef s = getCurrentMB().getBuffer();
@ -298,6 +298,3 @@ MemoryBufferRef ScriptLexer::getCurrentMB() {
return mb;
llvm_unreachable("getCurrentMB: failed to find a token");
}
} // namespace elf
} // namespace lld

21
lld/ELF/ScriptParser.cpp
View File

@ -38,9 +38,9 @@
using namespace llvm;
using namespace llvm::ELF;
using namespace llvm::support::endian;
using namespace lld;
using namespace lld::elf;
namespace lld {
namespace elf {
namespace {
class ScriptParser final : ScriptLexer {
public:
@ -1365,7 +1365,7 @@ Expr ScriptParser::readPrimary() {
return [=] { return cmd->size; };
}
if (tok == "SIZEOF_HEADERS")
return [=] { return getHeaderSize(); };
return [=] { return elf::getHeaderSize(); };
// Tok is the dot.
if (tok == ".")
@ -1607,19 +1607,18 @@ std::pair<uint32_t, uint32_t> ScriptParser::readMemoryAttributes() {
return {flags, negFlags};
}
void readLinkerScript(MemoryBufferRef mb) {
void elf::readLinkerScript(MemoryBufferRef mb) {
ScriptParser(mb).readLinkerScript();
}
void readVersionScript(MemoryBufferRef mb) {
void elf::readVersionScript(MemoryBufferRef mb) {
ScriptParser(mb).readVersionScript();
}
void readDynamicList(MemoryBufferRef mb) { ScriptParser(mb).readDynamicList(); }
void readDefsym(StringRef name, MemoryBufferRef mb) {
ScriptParser(mb).readDefsym(name);
void elf::readDynamicList(MemoryBufferRef mb) {
ScriptParser(mb).readDynamicList();
}
} // namespace elf
} // namespace lld
void elf::readDefsym(StringRef name, MemoryBufferRef mb) {
ScriptParser(mb).readDefsym(name);
}

9
lld/ELF/SymbolTable.cpp
View File

@ -26,10 +26,10 @@
using namespace llvm;
using namespace llvm::object;
using namespace llvm::ELF;
using namespace lld;
using namespace lld::elf;
namespace lld {
namespace elf {
SymbolTable *symtab;
SymbolTable *elf::symtab;
void SymbolTable::wrap(Symbol *sym, Symbol *real, Symbol *wrap) {
// Swap symbols as instructed by -wrap.
@ -269,6 +269,3 @@ void SymbolTable::scanVersionScript() {
// --dynamic-list.
handleDynamicList();
}
} // namespace elf
} // namespace lld

21
lld/ELF/Symbols.cpp
View File

@ -23,8 +23,9 @@
using namespace llvm;
using namespace llvm::object;
using namespace llvm::ELF;
using namespace lld;
using namespace lld::elf;
namespace lld {
// Returns a symbol for an error message.
static std::string demangle(StringRef symName) {
if (elf::config->demangle)
@ -32,7 +33,7 @@ static std::string demangle(StringRef symName) {
return std::string(symName);
}
std::string toString(const elf::Symbol &sym) {
std::string lld::toString(const elf::Symbol &sym) {
StringRef name = sym.getName();
std::string ret = demangle(name);
@ -44,11 +45,10 @@ std::string toString(const elf::Symbol &sym) {
return ret;
}
std::string toELFString(const Archive::Symbol &b) {
std::string lld::toELFString(const Archive::Symbol &b) {
return demangle(b.getName());
}
namespace elf {
Defined *ElfSym::bss;
Defined *ElfSym::etext1;
Defined *ElfSym::etext2;
@ -64,7 +64,7 @@ Defined *ElfSym::relaIpltStart;
Defined *ElfSym::relaIpltEnd;
Defined *ElfSym::riscvGlobalPointer;
Defined *ElfSym::tlsModuleBase;
DenseMap<const Symbol *, const InputFile *> backwardReferences;
DenseMap<const Symbol *, const InputFile *> elf::backwardReferences;
static uint64_t getSymVA(const Symbol &sym, int64_t &addend) {
switch (sym.kind()) {
@ -301,7 +301,7 @@ bool Symbol::includeInDynsym() const {
}
// Print out a log message for --trace-symbol.
void printTraceSymbol(const Symbol *sym) {
void elf::printTraceSymbol(const Symbol *sym) {
std::string s;
if (sym->isUndefined())
s = ": reference to ";
@ -317,7 +317,7 @@ void printTraceSymbol(const Symbol *sym) {
message(toString(sym->file) + s + sym->getName());
}
void maybeWarnUnorderableSymbol(const Symbol *sym) {
void elf::maybeWarnUnorderableSymbol(const Symbol *sym) {
if (!config->warnSymbolOrdering)
return;
@ -349,7 +349,7 @@ void maybeWarnUnorderableSymbol(const Symbol *sym) {
// Returns true if a symbol can be replaced at load-time by a symbol
// with the same name defined in other ELF executable or DSO.
bool computeIsPreemptible(const Symbol &sym) {
bool elf::computeIsPreemptible(const Symbol &sym) {
assert(!sym.isLocal());
// Only symbols with default visibility that appear in dynsym can be
@ -375,7 +375,7 @@ bool computeIsPreemptible(const Symbol &sym) {
return true;
}
void reportBackrefs() {
void elf::reportBackrefs() {
for (auto &it : backwardReferences) {
const Symbol &sym = *it.first;
warn("backward reference detected: " + sym.getName() + " in " +
@ -728,6 +728,3 @@ void Symbol::resolveShared(const SharedSymbol &other) {
binding = bind;
}
}
} // namespace elf
} // namespace lld

145
lld/ELF/SyntheticSections.cpp
View File

@ -46,13 +46,13 @@ using namespace llvm::dwarf;
using namespace llvm::ELF;
using namespace llvm::object;
using namespace llvm::support;
using namespace lld;
using namespace lld::elf;
using llvm::support::endian::read32le;
using llvm::support::endian::write32le;
using llvm::support::endian::write64le;
namespace lld {
namespace elf {
constexpr size_t MergeNoTailSection::numShards;
static uint64_t readUint(uint8_t *buf) {
@ -83,7 +83,7 @@ static ArrayRef<uint8_t> getVersion() {
// With this feature, you can identify LLD-generated binaries easily
// by "readelf --string-dump .comment <file>".
// The returned object is a mergeable string section.
MergeInputSection *createCommentSection() {
MergeInputSection *elf::createCommentSection() {
return make<MergeInputSection>(SHF_MERGE | SHF_STRINGS, SHT_PROGBITS, 1,
getVersion(), ".comment");
}
@ -139,7 +139,7 @@ MipsAbiFlagsSection<ELFT> *MipsAbiFlagsSection<ELFT>::create() {
flags.ases |= s->ases;
flags.flags1 |= s->flags1;
flags.flags2 |= s->flags2;
flags.fp_abi = getMipsFpAbiFlag(flags.fp_abi, s->fp_abi, filename);
flags.fp_abi = elf::getMipsFpAbiFlag(flags.fp_abi, s->fp_abi, filename);
};
if (create)
@ -253,7 +253,7 @@ MipsReginfoSection<ELFT> *MipsReginfoSection<ELFT>::create() {
return make<MipsReginfoSection<ELFT>>(reginfo);
}
InputSection *createInterpSection() {
InputSection *elf::createInterpSection() {
// StringSaver guarantees that the returned string ends with '\0'.
StringRef s = saver.save(config->dynamicLinker);
ArrayRef<uint8_t> contents = {(const uint8_t *)s.data(), s.size() + 1};
@ -262,7 +262,7 @@ InputSection *createInterpSection() {
".interp");
}
Defined *addSyntheticLocal(StringRef name, uint8_t type, uint64_t value,
Defined *elf::addSyntheticLocal(StringRef name, uint8_t type, uint64_t value,
uint64_t size, InputSectionBase &section) {
auto *s = make<Defined>(section.file, name, STB_LOCAL, STV_DEFAULT, type,
value, size, &section);
@ -1275,7 +1275,7 @@ static uint64_t addPltRelSz() {
// Add remaining entries to complete .dynamic contents.
template <class ELFT> void DynamicSection<ELFT>::finalizeContents() {
Partition &part = getPartition();
elf::Partition &part = getPartition();
bool isMain = part.name.empty();
for (StringRef s : config->filterList)
@ -3049,7 +3049,7 @@ bool VersionTableSection::isNeeded() const {
(getPartition().verDef || getPartition().verNeed->isNeeded());
}
void addVerneed(Symbol *ss) {
void elf::addVerneed(Symbol *ss) {
auto &file = cast<SharedFile>(*ss->file);
if (ss->verdefIndex == VER_NDX_GLOBAL) {
ss->versionId = VER_NDX_GLOBAL;
@ -3232,7 +3232,7 @@ void MergeNoTailSection::finalizeContents() {
});
}
MergeSyntheticSection *createMergeSynthetic(StringRef name, uint32_t type,
MergeSyntheticSection *elf::createMergeSynthetic(StringRef name, uint32_t type,
uint64_t flags,
uint32_t alignment) {
bool shouldTailMerge = (flags & SHF_STRINGS) && config->optimize >= 2;
@ -3241,7 +3241,7 @@ MergeSyntheticSection *createMergeSynthetic(StringRef name, uint32_t type,
return make<MergeNoTailSection>(name, type, flags, alignment);
}
template <class ELFT> void splitSections() {
template <class ELFT> void elf::splitSections() {
llvm::TimeTraceScope timeScope("Split sections");
// splitIntoPieces needs to be called on each MergeInputSection
// before calling finalizeContents().
@ -3627,7 +3627,7 @@ static uint8_t getAbiVersion() {
return 0;
}
template <typename ELFT> void writeEhdr(uint8_t *buf, Partition &part) {
template <typename ELFT> void elf::writeEhdr(uint8_t *buf, Partition &part) {
// For executable segments, the trap instructions are written before writing
// the header. Setting Elf header bytes to zero ensures that any unused bytes
// in header are zero-cleared, instead of having trap instructions.
@ -3653,7 +3653,7 @@ template <typename ELFT> void writeEhdr(uint8_t *buf, Partition &part) {
}
}
template <typename ELFT> void writePhdrs(uint8_t *buf, Partition &part) {
template <typename ELFT> void elf::writePhdrs(uint8_t *buf, Partition &part) {
// Write the program header table.
auto *hBuf = reinterpret_cast<typename ELFT::Phdr *>(buf);
for (PhdrEntry *p : part.phdrs) {
@ -3728,85 +3728,82 @@ void PartitionIndexSection::writeTo(uint8_t *buf) {
}
}
InStruct in;
InStruct elf::in;
std::vector<Partition> partitions;
Partition *mainPart;
std::vector<Partition> elf::partitions;
Partition *elf::mainPart;
template GdbIndexSection *GdbIndexSection::create<ELF32LE>();
template GdbIndexSection *GdbIndexSection::create<ELF32BE>();
template GdbIndexSection *GdbIndexSection::create<ELF64LE>();
template GdbIndexSection *GdbIndexSection::create<ELF64BE>();
template void splitSections<ELF32LE>();
template void splitSections<ELF32BE>();
template void splitSections<ELF64LE>();
template void splitSections<ELF64BE>();
template void elf::splitSections<ELF32LE>();
template void elf::splitSections<ELF32BE>();
template void elf::splitSections<ELF64LE>();
template void elf::splitSections<ELF64BE>();
template class MipsAbiFlagsSection<ELF32LE>;
template class MipsAbiFlagsSection<ELF32BE>;
template class MipsAbiFlagsSection<ELF64LE>;
template class MipsAbiFlagsSection<ELF64BE>;
template class elf::MipsAbiFlagsSection<ELF32LE>;
template class elf::MipsAbiFlagsSection<ELF32BE>;
template class elf::MipsAbiFlagsSection<ELF64LE>;
template class elf::MipsAbiFlagsSection<ELF64BE>;
template class MipsOptionsSection<ELF32LE>;
template class MipsOptionsSection<ELF32BE>;
template class MipsOptionsSection<ELF64LE>;
template class MipsOptionsSection<ELF64BE>;
template class elf::MipsOptionsSection<ELF32LE>;
template class elf::MipsOptionsSection<ELF32BE>;
template class elf::MipsOptionsSection<ELF64LE>;
template class elf::MipsOptionsSection<ELF64BE>;
template class MipsReginfoSection<ELF32LE>;
template class MipsReginfoSection<ELF32BE>;
template class MipsReginfoSection<ELF64LE>;
template class MipsReginfoSection<ELF64BE>;
template class elf::MipsReginfoSection<ELF32LE>;
template class elf::MipsReginfoSection<ELF32BE>;
template class elf::MipsReginfoSection<ELF64LE>;
template class elf::MipsReginfoSection<ELF64BE>;
template class DynamicSection<ELF32LE>;
template class DynamicSection<ELF32BE>;
template class DynamicSection<ELF64LE>;
template class DynamicSection<ELF64BE>;
template class elf::DynamicSection<ELF32LE>;
template class elf::DynamicSection<ELF32BE>;
template class elf::DynamicSection<ELF64LE>;
template class elf::DynamicSection<ELF64BE>;
template class RelocationSection<ELF32LE>;
template class RelocationSection<ELF32BE>;
template class RelocationSection<ELF64LE>;
template class RelocationSection<ELF64BE>;
template class elf::RelocationSection<ELF32LE>;
template class elf::RelocationSection<ELF32BE>;
template class elf::RelocationSection<ELF64LE>;
template class elf::RelocationSection<ELF64BE>;
template class AndroidPackedRelocationSection<ELF32LE>;
template class AndroidPackedRelocationSection<ELF32BE>;
template class AndroidPackedRelocationSection<ELF64LE>;
template class AndroidPackedRelocationSection<ELF64BE>;
template class elf::AndroidPackedRelocationSection<ELF32LE>;
template class elf::AndroidPackedRelocationSection<ELF32BE>;
template class elf::AndroidPackedRelocationSection<ELF64LE>;
template class elf::AndroidPackedRelocationSection<ELF64BE>;
template class RelrSection<ELF32LE>;
template class RelrSection<ELF32BE>;
template class RelrSection<ELF64LE>;
template class RelrSection<ELF64BE>;
template class elf::RelrSection<ELF32LE>;
template class elf::RelrSection<ELF32BE>;
template class elf::RelrSection<ELF64LE>;
template class elf::RelrSection<ELF64BE>;
template class SymbolTableSection<ELF32LE>;
template class SymbolTableSection<ELF32BE>;
template class SymbolTableSection<ELF64LE>;
template class SymbolTableSection<ELF64BE>;
template class elf::SymbolTableSection<ELF32LE>;
template class elf::SymbolTableSection<ELF32BE>;
template class elf::SymbolTableSection<ELF64LE>;
template class elf::SymbolTableSection<ELF64BE>;
template class VersionNeedSection<ELF32LE>;
template class VersionNeedSection<ELF32BE>;
template class VersionNeedSection<ELF64LE>;
template class VersionNeedSection<ELF64BE>;
template class elf::VersionNeedSection<ELF32LE>;
template class elf::VersionNeedSection<ELF32BE>;
template class elf::VersionNeedSection<ELF64LE>;
template class elf::VersionNeedSection<ELF64BE>;
template void writeEhdr<ELF32LE>(uint8_t *Buf, Partition &Part);
template void writeEhdr<ELF32BE>(uint8_t *Buf, Partition &Part);
template void writeEhdr<ELF64LE>(uint8_t *Buf, Partition &Part);
template void writeEhdr<ELF64BE>(uint8_t *Buf, Partition &Part);
template void elf::writeEhdr<ELF32LE>(uint8_t *Buf, Partition &Part);
template void elf::writeEhdr<ELF32BE>(uint8_t *Buf, Partition &Part);
template void elf::writeEhdr<ELF64LE>(uint8_t *Buf, Partition &Part);
template void elf::writeEhdr<ELF64BE>(uint8_t *Buf, Partition &Part);
template void writePhdrs<ELF32LE>(uint8_t *Buf, Partition &Part);
template void writePhdrs<ELF32BE>(uint8_t *Buf, Partition &Part);
template void writePhdrs<ELF64LE>(uint8_t *Buf, Partition &Part);
template void writePhdrs<ELF64BE>(uint8_t *Buf, Partition &Part);
template void elf::writePhdrs<ELF32LE>(uint8_t *Buf, Partition &Part);
template void elf::writePhdrs<ELF32BE>(uint8_t *Buf, Partition &Part);
template void elf::writePhdrs<ELF64LE>(uint8_t *Buf, Partition &Part);
template void elf::writePhdrs<ELF64BE>(uint8_t *Buf, Partition &Part);
template class PartitionElfHeaderSection<ELF32LE>;
template class PartitionElfHeaderSection<ELF32BE>;
template class PartitionElfHeaderSection<ELF64LE>;
template class PartitionElfHeaderSection<ELF64BE>;
template class elf::PartitionElfHeaderSection<ELF32LE>;
template class elf::PartitionElfHeaderSection<ELF32BE>;
template class elf::PartitionElfHeaderSection<ELF64LE>;
template class elf::PartitionElfHeaderSection<ELF64BE>;
template class PartitionProgramHeadersSection<ELF32LE>;
template class PartitionProgramHeadersSection<ELF32BE>;
template class PartitionProgramHeadersSection<ELF64LE>;
template class PartitionProgramHeadersSection<ELF64BE>;
} // namespace elf
} // namespace lld
template class elf::PartitionProgramHeadersSection<ELF32LE>;
template class elf::PartitionProgramHeadersSection<ELF32BE>;
template class elf::PartitionProgramHeadersSection<ELF64LE>;
template class elf::PartitionProgramHeadersSection<ELF64BE>;

17
lld/ELF/Target.cpp
View File

@ -35,19 +35,19 @@
using namespace llvm;
using namespace llvm::object;
using namespace llvm::ELF;
using namespace lld;
using namespace lld::elf;
namespace lld {
std::string toString(elf::RelType type) {
const TargetInfo *elf::target;
std::string lld::toString(RelType type) {
StringRef s = getELFRelocationTypeName(elf::config->emachine, type);
if (s == "Unknown")
return ("Unknown (" + Twine(type) + ")").str();
return std::string(s);
}
namespace elf {
const TargetInfo *target;
TargetInfo *getTarget() {
TargetInfo *elf::getTarget() {
switch (config->emachine) {
case EM_386:
case EM_IAMCU:
@ -112,7 +112,7 @@ template <class ELFT> static ErrorPlace getErrPlace(const uint8_t *loc) {
return {};
}
ErrorPlace getErrorPlace(const uint8_t *loc) {
ErrorPlace elf::getErrorPlace(const uint8_t *loc) {
switch (config->ekind) {
case ELF32LEKind:
return getErrPlace<ELF32LE>(loc);
@ -186,6 +186,3 @@ uint64_t TargetInfo::getImageBase() const {
return *config->imageBase;
return config->isPic ? 0 : defaultImageBase;
}
} // namespace elf
} // namespace lld

14
lld/ELF/Thunks.cpp
View File

@ -40,9 +40,8 @@
using namespace llvm;
using namespace llvm::object;
using namespace llvm::ELF;
namespace lld {
namespace elf {
using namespace lld;
using namespace lld::elf;
namespace {
@ -714,7 +713,7 @@ InputSection *MicroMipsR6Thunk::getTargetInputSection() const {
return dyn_cast<InputSection>(dr.section);
}
void writePPC32PltCallStub(uint8_t *buf, uint64_t gotPltVA,
void elf::writePPC32PltCallStub(uint8_t *buf, uint64_t gotPltVA,
const InputFile *file, int64_t addend) {
if (!config->isPic) {
write32(buf + 0, 0x3d600000 | (gotPltVA + 0x8000) >> 16); // lis r11,ha
@ -799,7 +798,7 @@ void PPC32LongThunk::writeTo(uint8_t *buf) {
write32(buf + 4, 0x4e800420); // bctr
}
void writePPC64LoadAndBranch(uint8_t *buf, int64_t offset) {
void elf::writePPC64LoadAndBranch(uint8_t *buf, int64_t offset) {
uint16_t offHa = (offset + 0x8000) >> 16;
uint16_t offLo = offset & 0xffff;
@ -956,7 +955,7 @@ static Thunk *addThunkPPC64(RelType type, Symbol &s, int64_t a) {
return make<PPC64PDLongBranchThunk>(s, a);
}
Thunk *addThunk(const InputSection &isec, Relocation &rel) {
Thunk *elf::addThunk(const InputSection &isec, Relocation &rel) {
Symbol &s = *rel.sym;
int64_t a = rel.addend;
@ -977,6 +976,3 @@ Thunk *addThunk(const InputSection &isec, Relocation &rel) {
llvm_unreachable("add Thunk only supported for ARM, Mips and PowerPC");
}
} // end namespace elf
} // end namespace lld

35
lld/ELF/Writer.cpp
View File

@ -38,9 +38,9 @@ using namespace llvm::ELF;
using namespace llvm::object;
using namespace llvm::support;
using namespace llvm::support::endian;
using namespace lld;
using namespace lld::elf;
namespace lld {
namespace elf {
namespace {
// The writer writes a SymbolTable result to a file.
template <class ELFT> class Writer {
@ -95,7 +95,7 @@ static bool isSectionPrefix(StringRef prefix, StringRef name) {
return name.startswith(prefix) || name == prefix.drop_back();
}
StringRef getOutputSectionName(const InputSectionBase *s) {
StringRef elf::getOutputSectionName(const InputSectionBase *s) {
if (config->relocatable)
return s->name;
@ -152,7 +152,7 @@ static bool needsInterpSection() {
!config->dynamicLinker.empty() && script->needsInterpSection();
}
template <class ELFT> void writeResult() {
template <class ELFT> void elf::writeResult() {
llvm::TimeTraceScope timeScope("Write output file");
Writer<ELFT>().run();
}
@ -177,7 +177,7 @@ static void removeEmptyPTLoad(std::vector<PhdrEntry *> &phdrs) {
phdrs.erase(it, phdrs.end());
}
void copySectionsIntoPartitions() {
void elf::copySectionsIntoPartitions() {
std::vector<InputSectionBase *> newSections;
for (unsigned part = 2; part != partitions.size() + 1; ++part) {
for (InputSectionBase *s : inputSections) {
@ -199,7 +199,7 @@ void copySectionsIntoPartitions() {
newSections.end());
}
void combineEhSections() {
void elf::combineEhSections() {
for (InputSectionBase *&s : inputSections) {
// Ignore dead sections and the partition end marker (.part.end),
// whose partition number is out of bounds.
@ -240,7 +240,7 @@ static Defined *addAbsolute(StringRef name) {
// The linker is expected to define some symbols depending on
// the linking result. This function defines such symbols.
void addReservedSymbols() {
void elf::addReservedSymbols() {
if (config->emachine == EM_MIPS) {
// Define _gp for MIPS. st_value of _gp symbol will be updated by Writer
// so that it points to an absolute address which by default is relative
@ -333,7 +333,7 @@ static OutputSection *findSection(StringRef name, unsigned partition = 1) {
return nullptr;
}
template <class ELFT> void createSyntheticSections() {
template <class ELFT> void elf::createSyntheticSections() {
// Initialize all pointers with NULL. This is needed because
// you can call lld::elf::main more than once as a library.
memset(&Out::first, 0, sizeof(Out));
@ -2960,15 +2960,12 @@ template <class ELFT> void Writer<ELFT>::writeBuildId() {
part.buildId->writeBuildId(buildId);
}
template void createSyntheticSections<ELF32LE>();
template void createSyntheticSections<ELF32BE>();
template void createSyntheticSections<ELF64LE>();
template void createSyntheticSections<ELF64BE>();
template void elf::createSyntheticSections<ELF32LE>();
template void elf::createSyntheticSections<ELF32BE>();
template void elf::createSyntheticSections<ELF64LE>();
template void elf::createSyntheticSections<ELF64BE>();
template void writeResult<ELF32LE>();
template void writeResult<ELF32BE>();
template void writeResult<ELF64LE>();
template void writeResult<ELF64BE>();
} // namespace elf
} // namespace lld
template void elf::writeResult<ELF32LE>();
template void elf::writeResult<ELF32BE>();
template void elf::writeResult<ELF64LE>();
template void elf::writeResult<ELF64BE>();