From 4f98e0bc030dacf65af981968a8f4f8234f5f32f Mon Sep 17 00:00:00 2001
From: George Rimar <grimar@accesssoftek.com>
Date: Wed, 4 Apr 2018 08:13:28 +0000
Subject: [PATCH] [ELF] - Revert r329060 "Simplify createFiles. NFCI."

Was requested during post commit review.

llvm-svn: 329155
---
 lld/ELF/Driver.cpp | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index 3f77ccee223e..b6c8ce946198 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -879,8 +879,7 @@ static bool getBinaryOption(StringRef S) {
 
 void LinkerDriver::createFiles(opt::InputArgList &Args) {
   for (auto *Arg : Args) {
-    unsigned ID = Arg->getOption().getUnaliasedOption().getID();
-    switch (ID) {
+    switch (Arg->getOption().getUnaliasedOption().getID()) {
     case OPT_library:
       addLibrary(Arg->getValue());
       break;
@@ -903,19 +902,25 @@ void LinkerDriver::createFiles(opt::InputArgList &Args) {
       error(Twine("cannot find linker script ") + Arg->getValue());
       break;
     case OPT_as_needed:
-    case OPT_no_as_needed:
-      Config->AsNeeded = (ID == OPT_as_needed);
+      Config->AsNeeded = true;
       break;
     case OPT_format:
       InBinary = getBinaryOption(Arg->getValue());
       break;
+    case OPT_no_as_needed:
+      Config->AsNeeded = false;
+      break;
     case OPT_Bstatic:
+      Config->Static = true;
+      break;
     case OPT_Bdynamic:
-      Config->Static = (ID == OPT_Bstatic);
+      Config->Static = false;
       break;
     case OPT_whole_archive:
+      InWholeArchive = true;
+      break;
     case OPT_no_whole_archive:
-      InWholeArchive = (ID == OPT_whole_archive);
+      InWholeArchive = false;
       break;
     case OPT_just_symbols:
       if (Optional<MemoryBufferRef> MB = readFile(Arg->getValue())) {
@@ -924,8 +929,10 @@ void LinkerDriver::createFiles(opt::InputArgList &Args) {
       }
       break;
     case OPT_start_lib:
+      InLib = true;
+      break;
     case OPT_end_lib:
-      InLib = (ID == OPT_start_lib);
+      InLib = false;
       break;
     }
   }