[lld] r250172 - ELF2: Rename ElfKind -> EKind.
Rui Ueyama via llvm-commits
llvm-commits at lists.llvm.org
Tue Oct 13 09:20:51 PDT 2015
Author: ruiu
Date: Tue Oct 13 11:20:50 2015
New Revision: 250172
URL: http://llvm.org/viewvc/llvm-project?rev=250172&view=rev
Log:
ELF2: Rename ElfKind -> EKind.
ELFKind as a type name and ElfKind is a variable name was too subtle.
Modified:
lld/trunk/ELF/Config.h
lld/trunk/ELF/Driver.cpp
lld/trunk/ELF/InputFiles.cpp
lld/trunk/ELF/SymbolTable.cpp
Modified: lld/trunk/ELF/Config.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Config.h?rev=250172&r1=250171&r2=250172&view=diff
==============================================================================
--- lld/trunk/ELF/Config.h (original)
+++ lld/trunk/ELF/Config.h Tue Oct 13 11:20:50 2015
@@ -55,7 +55,7 @@ struct Configuration {
bool Static = false;
bool Verbose;
bool ZNow = false;
- ELFKind ElfKind = ELFNoneKind;
+ ELFKind EKind = ELFNoneKind;
uint16_t EMachine = llvm::ELF::EM_NONE;
};
Modified: lld/trunk/ELF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=250172&r1=250171&r2=250172&view=diff
==============================================================================
--- lld/trunk/ELF/Driver.cpp (original)
+++ lld/trunk/ELF/Driver.cpp Tue Oct 13 11:20:50 2015
@@ -101,7 +101,7 @@ void LinkerDriver::main(ArrayRef<const c
opt::InputArgList Args = parseArgs(&Alloc, ArgsArr);
createFiles(Args);
- switch (Config->ElfKind) {
+ switch (Config->EKind) {
case ELF32LEKind:
link<ELF32LE>(Args);
return;
@@ -131,7 +131,7 @@ void LinkerDriver::createFiles(opt::Inpu
if (auto *Arg = Args.getLastArg(OPT_m)) {
std::pair<ELFKind, uint16_t> P = parseEmulation(Arg->getValue());
- Config->ElfKind = P.first;
+ Config->EKind = P.first;
Config->EMachine = P.second;
}
Modified: lld/trunk/ELF/InputFiles.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=250172&r1=250171&r2=250172&view=diff
==============================================================================
--- lld/trunk/ELF/InputFiles.cpp (original)
+++ lld/trunk/ELF/InputFiles.cpp Tue Oct 13 11:20:50 2015
@@ -319,8 +319,8 @@ static std::unique_ptr<InputFile> create
if (!Config->FirstElf)
Config->FirstElf = Ret.get();
- if (Config->ElfKind == ELFNoneKind) {
- Config->ElfKind = Ret->getELFKind();
+ if (Config->EKind == ELFNoneKind) {
+ Config->EKind = Ret->getELFKind();
Config->EMachine = Ret->getEMachine();
}
Modified: lld/trunk/ELF/SymbolTable.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=250172&r1=250171&r2=250172&view=diff
==============================================================================
--- lld/trunk/ELF/SymbolTable.cpp (original)
+++ lld/trunk/ELF/SymbolTable.cpp Tue Oct 13 11:20:50 2015
@@ -211,8 +211,7 @@ void SymbolTable<ELFT>::checkCompatibili
auto *E = dyn_cast<ELFFileBase<ELFT>>(File.get());
if (!E)
return;
- if (E->getELFKind() == Config->ElfKind &&
- E->getEMachine() == Config->EMachine)
+ if (E->getELFKind() == Config->EKind && E->getEMachine() == Config->EMachine)
return;
StringRef A = E->getName();
StringRef B = Config->Emulation;
More information about the llvm-commits
mailing list