summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Silva <chisophugis@gmail.com>2016-04-02 01:51:51 +0000
committerSean Silva <chisophugis@gmail.com>2016-04-02 01:51:51 +0000
commit242bbdb7bf73e99a7e79b8d37320e7f14906102f (patch)
tree6ba9baba791e9a9457812d4b35fc876d40394a10
parent8e4ad5dbf86aa49a01bf5c357d5b4f54f926d6da (diff)
downloadbcm5719-llvm-242bbdb7bf73e99a7e79b8d37320e7f14906102f.tar.gz
bcm5719-llvm-242bbdb7bf73e99a7e79b8d37320e7f14906102f.zip
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 llvm-svn: 265207
-rw-r--r--lld/ELF/Config.h2
-rw-r--r--lld/ELF/Driver.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/lld/ELF/Config.h b/lld/ELF/Config.h
index 36f9efc9762..2cd9510dd6b 100644
--- a/lld/ELF/Config.h
+++ b/lld/ELF/Config.h
@@ -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;
};
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index 80fb60c8e70..c0b2a6917e4 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -309,6 +309,7 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) {
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());
}
OpenPOWER on IntegriCloud