[lld] r284697 - Format. NFC.

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Thu Oct 20 00:23:23 2016
New Revision: 284697

URL: http://llvm.org/viewvc/llvm-project?rev=284697&view=rev
Log:
Format. NFC.

Modified:
    lld/trunk/ELF/Driver.cpp
    lld/trunk/ELF/InputSection.h

Modified: lld/trunk/ELF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=284697&r1=284696&r2=284697&view=diff
==============================================================================
--- lld/trunk/ELF/Driver.cpp (original)
+++ lld/trunk/ELF/Driver.cpp Thu Oct 20 00:23:23 2016
@@ -450,8 +450,6 @@ void LinkerDriver::readConfigs(opt::Inpu
   if (!RPaths.empty())
     Config->RPath = llvm::join(RPaths.begin(), RPaths.end(), ":");
 
-  Config->SectionStartMap = getSectionStartMap(Args);
-
   if (auto *Arg = Args.getLastArg(OPT_m)) {
     // Parse ELF{32,64}{LE,BE} and CPU type.
     StringRef S = Arg->getValue();
@@ -512,13 +510,18 @@ void LinkerDriver::readConfigs(opt::Inpu
   Config->ZNow = hasZOption(Args, "now");
   Config->ZOrigin = hasZOption(Args, "origin");
   Config->ZRelro = !hasZOption(Args, "norelro");
+  Config->ZStackSize = getZOptionValue(Args, "stack-size", -1);
   Config->ZWxneeded = hasZOption(Args, "wxneeded");
 
+  Config->OFormatBinary = isOutputFormatBinary(Args);
+  Config->SectionStartMap = getSectionStartMap(Args);
+  Config->SortSection = getSortKind(Args);
+  Config->Target2 = getTarget2Option(Args);
+  Config->UnresolvedSymbols = getUnresolvedSymbolOption(Args);
+
   if (!Config->Relocatable)
     Config->Strip = getStripOption(Args);
 
-  Config->ZStackSize = getZOptionValue(Args, "stack-size", -1);
-
   // Config->Pic is true if we are generating position-independent code.
   Config->Pic = Config->Pie || Config->Shared;
 
@@ -554,8 +557,6 @@ void LinkerDriver::readConfigs(opt::Inpu
     }
   }
 
-  Config->OFormatBinary = isOutputFormatBinary(Args);
-
   for (auto *Arg : Args.filtered(OPT_auxiliary))
     Config->AuxiliaryList.push_back(Arg->getValue());
   if (!Config->Shared && !Config->AuxiliaryList.empty())
@@ -564,12 +565,6 @@ void LinkerDriver::readConfigs(opt::Inpu
   for (auto *Arg : Args.filtered(OPT_undefined))
     Config->Undefined.push_back(Arg->getValue());
 
-  Config->SortSection = getSortKind(Args);
-
-  Config->UnresolvedSymbols = getUnresolvedSymbolOption(Args);
-
-  Config->Target2 = getTarget2Option(Args);
-
   if (auto *Arg = Args.getLastArg(OPT_dynamic_list))
     if (Optional<MemoryBufferRef> Buffer = readFile(Arg->getValue()))
       parseDynamicList(*Buffer);

Modified: lld/trunk/ELF/InputSection.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputSection.h?rev=284697&r1=284696&r2=284697&view=diff
==============================================================================
--- lld/trunk/ELF/InputSection.h (original)
+++ lld/trunk/ELF/InputSection.h Thu Oct 20 00:23:23 2016
@@ -54,15 +54,10 @@ private:
 public:
   Kind kind() const { return (Kind)SectionKind; }
 
-  // Used for garbage collection.
-  unsigned Live : 1;
-
+  unsigned Live : 1; // for garbage collection
   unsigned Compressed : 1;
-
   uint32_t Alignment;
-
   StringRef Name;
-
   ArrayRef<uint8_t> Data;
   ArrayRef<uint8_t> getData(const SectionPiece &P) const;