summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp b/lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp
index e494be99145..7c339e58047 100644
--- a/lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp
@@ -148,10 +148,17 @@ private:
static std::vector<uint8_t> rawContent;
};
-std::vector<uint8_t> FuncAtom::rawContent = {
+// MSVC doesn't seem to like C++11 initializer list, so initialize the
+// vector from an array.
+namespace {
+uint8_t FuncAtomContent[] = {
0xff, 0x25, 0x00, 0x00, 0x00, 0x00, // jmp *0x0
- 0x90, 0x90, // nop; nop
+ 0x90, 0x90 // nop; nop
};
+} // anonymous namespace
+
+std::vector<uint8_t> FuncAtom::rawContent(
+ FuncAtomContent, FuncAtomContent + sizeof(FuncAtomContent));
class FileImportLibrary : public File {
public:
OpenPOWER on IntegriCloud