[lld] r284692 - Simplify. NFC.

Rui Ueyama via llvm-commits llvm-commits at lists.llvm.org
Wed Oct 19 21:36:36 PDT 2016


Author: ruiu
Date: Wed Oct 19 23:36:36 2016
New Revision: 284692

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

Modified:
    lld/trunk/ELF/Driver.cpp

Modified: lld/trunk/ELF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=284692&r1=284691&r2=284692&view=diff
==============================================================================
--- lld/trunk/ELF/Driver.cpp (original)
+++ lld/trunk/ELF/Driver.cpp Wed Oct 19 23:36:36 2016
@@ -580,6 +580,18 @@ void LinkerDriver::readConfigs(opt::Inpu
       readVersionScript(*Buffer);
 }
 
+// Returns a value of "-format" option.
+static bool getBinaryOption(opt::Arg *Arg) {
+  StringRef S = Arg->getValue();
+  if (S == "binary")
+    return true;
+  if (S == "elf" || S == "default")
+    return false;
+  error("unknown " + Arg->getSpelling() + " format: " + S +
+        " (supported formats: elf, default, binary)");
+  return false;
+}
+
 void LinkerDriver::createFiles(opt::InputArgList &Args) {
   for (auto *Arg : Args) {
     switch (Arg->getOption().getID()) {
@@ -596,17 +608,9 @@ void LinkerDriver::createFiles(opt::Inpu
     case OPT_as_needed:
       Config->AsNeeded = true;
       break;
-    case OPT_format: {
-      StringRef Val = Arg->getValue();
-      if (Val == "elf" || Val == "default")
-        Config->Binary = false;
-      else if (Val == "binary")
-        Config->Binary = true;
-      else
-        error("unknown " + Arg->getSpelling() + " format: " + Arg->getValue() +
-              " (supported formats: elf, default, binary)");
+    case OPT_format:
+      Config->Binary = getBinaryOption(Arg);
       break;
-    }
     case OPT_no_as_needed:
       Config->AsNeeded = false;
       break;




More information about the llvm-commits mailing list