[lld] r265207 - Fix MSVC build after r265206

[Sean Silva via llvm-commits]

Author: silvas
Date: Fri Apr  1 20:51:51 2016
New Revision: 265207

URL: http://llvm.org/viewvc/llvm-project?rev=265207&view=rev
Log:
Fix MSVC build after r265206

c:\b\slave\sanitizer-windows\llvm\tools\lld\elf\Config.h(94) : error C2797: 'lld::elf::Configuration::MLlvm': list initialization inside member initializer list or non-static data member initializer is not implemented

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

Modified: lld/trunk/ELF/Config.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Config.h?rev=265207&r1=265206&r2=265207&view=diff
==============================================================================
--- lld/trunk/ELF/Config.h (original)
+++ lld/trunk/ELF/Config.h Fri Apr  1 20:51:51 2016
@@ -91,7 +91,7 @@ struct Configuration {
   uint16_t EMachine = llvm::ELF::EM_NONE;
   uint64_t EntryAddr = -1;
   unsigned LtoO;
-  std::vector<const char *> MLlvm = {"lld (LLVM option parsing)"};
+  std::vector<const char *> MLlvm;
   unsigned Optimize;
 };
 

Modified: lld/trunk/ELF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=265207&r1=265206&r2=265207&view=diff
==============================================================================
--- lld/trunk/ELF/Driver.cpp (original)
+++ lld/trunk/ELF/Driver.cpp Fri Apr  1 20:51:51 2016
@@ -309,6 +309,7 @@ void LinkerDriver::readConfigs(opt::Inpu
   for (auto *Arg : Args.filtered(OPT_undefined))
     Config->Undefined.push_back(Arg->getValue());
 
+  Config->MLlvm.push_back("lld (LLVM option parsing)");
   for (auto *Arg : Args.filtered(OPT_mllvm))
     Config->MLlvm.push_back(Arg->getValue());
 }