From d19bc048692a4c5287c7276a491b98e520d90db9 Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Thu, 20 Sep 2018 21:29:14 +0000 Subject: [PATCH] Make variable names shorter. NFC. llvm-svn: 342686 --- lld/ELF/Driver.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp index 0724c79..0635bf6 100644 --- a/lld/ELF/Driver.cpp +++ b/lld/ELF/Driver.cpp @@ -63,6 +63,7 @@ using namespace llvm; using namespace llvm::ELF; using namespace llvm::object; using namespace llvm::sys; +using namespace llvm::support; using namespace lld; using namespace lld::elf; @@ -961,15 +962,14 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) { // This function initialize such members. See Config.h for the details // of these values. static void setConfigs(opt::InputArgList &Args) { - ELFKind Kind = Config->EKind; - uint16_t Machine = Config->EMachine; + ELFKind K = Config->EKind; + uint16_t M = Config->EMachine; Config->CopyRelocs = (Config->Relocatable || Config->EmitRelocs); - Config->Is64 = (Kind == ELF64LEKind || Kind == ELF64BEKind); - Config->IsLE = (Kind == ELF32LEKind || Kind == ELF64LEKind); - Config->Endianness = - Config->IsLE ? support::endianness::little : support::endianness::big; - Config->IsMips64EL = (Kind == ELF64LEKind && Machine == EM_MIPS); + Config->Is64 = (K == ELF64LEKind || K == ELF64BEKind); + Config->IsLE = (K == ELF32LEKind || K == ELF64LEKind); + Config->Endianness = Config->IsLE ? endianness::little : endianness::big; + Config->IsMips64EL = (K == ELF64LEKind && M == EM_MIPS); Config->Pic = Config->Pie || Config->Shared; Config->Wordsize = Config->Is64 ? 8 : 4; @@ -986,9 +986,8 @@ static void setConfigs(opt::InputArgList &Args) { // You cannot choose which one, Rel or Rela, you want to use. Instead each // ABI defines which one you need to use. The following expression expresses // that. - Config->IsRela = Machine == EM_AARCH64 || Machine == EM_AMDGPU || - Machine == EM_PPC || Machine == EM_PPC64 || - Machine == EM_RISCV || Machine == EM_X86_64; + Config->IsRela = M == EM_AARCH64 || M == EM_AMDGPU || M == EM_PPC || + M == EM_PPC64 || M == EM_RISCV || M == EM_X86_64; // If the output uses REL relocations we must store the dynamic relocation // addends to the output sections. We also store addends for RELA relocations @@ -1000,7 +999,7 @@ static void setConfigs(opt::InputArgList &Args) { !Config->IsRela; Config->TocOptimize = - Args.hasFlag(OPT_toc_optimize, OPT_no_toc_optimize, Machine == EM_PPC64); + Args.hasFlag(OPT_toc_optimize, OPT_no_toc_optimize, M == EM_PPC64); } // Returns a value of "-format" option. -- 2.7.4