commit 305a7d3f449f003acf4e76ca36c64008841b7a62
author Rui Ueyama <ruiu@google.com> Tue Oct 27 19:29:27 2015 +0000
committer Rui Ueyama <ruiu@google.com> Tue Oct 27 19:29:27 2015 +0000
tree 21fdc9c418a49c2b6e44e0761c99987b781d6a6d
parent 339428232a9247937028d2fc6e1bda0929fc51e6

ELF2: Make parseEmulation side-effect free. NFC.

llvm-svn: 251440

lld/ELF/Driver.cpp

diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index 5a42880..96ebabe 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -38,7 +38,6 @@
 }
 
 static std::pair<ELFKind, uint16_t> parseEmulation(StringRef S) {
-  Config->Emulation = S;
   if (S == "elf32btsmip")
     return {ELF32BEKind, EM_MIPS};
   if (S == "elf32ltsmip")
@@ -130,9 +129,11 @@
     Config->RPath = llvm::join(RPaths.begin(), RPaths.end(), ":");
 
   if (auto *Arg = Args.getLastArg(OPT_m)) {
-    std::pair<ELFKind, uint16_t> P = parseEmulation(Arg->getValue());
+    StringRef S = Arg->getValue();
+    std::pair<ELFKind, uint16_t> P = parseEmulation(S);
     Config->EKind = P.first;
     Config->EMachine = P.second;
+    Config->Emulation = S;
   }
 
   Config->AllowMultipleDefinition = Args.hasArg(OPT_allow_multiple_definition);