summaryrefslogtreecommitdiffstats
path: root/lld
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2013-06-30 14:14:44 +0000
committerRui Ueyama <ruiu@google.com>2013-06-30 14:14:44 +0000
commit39a2c197cfc1e8863dcec51a7d406beaa5fd3876 (patch)
tree2d3a901dd3e1387f1fa1a7f8bc5fb3b5f0aa332b /lld
parentcc846016bfa5bba6dad85cf48fc58ab16e56a9e7 (diff)
downloadbcm5719-llvm-39a2c197cfc1e8863dcec51a7d406beaa5fd3876.tar.gz
bcm5719-llvm-39a2c197cfc1e8863dcec51a7d406beaa5fd3876.zip
[PECOFF][Writer] Fix buildbot failure on x86_64-win7.
llvm-svn: 185285
Diffstat (limited to 'lld')
-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