diff options
| author | Eric Beckmann <ecbeckmann@google.com> | 2017-07-05 19:04:33 +0000 |
|---|---|---|
| committer | Eric Beckmann <ecbeckmann@google.com> | 2017-07-05 19:04:33 +0000 |
| commit | 0eafa581a3878c5fb52a513bb329fa82002e72da (patch) | |
| tree | a9d93e77c93db71722fed0ba09b1bd745e1fa702 /llvm/lib/Object/WindowsResource.cpp | |
| parent | 36793a0ecf30a4382a1626ca8fdd76117b0c5945 (diff) | |
| download | bcm5719-llvm-0eafa581a3878c5fb52a513bb329fa82002e72da.tar.gz bcm5719-llvm-0eafa581a3878c5fb52a513bb329fa82002e72da.zip | |
Revert "Revert "Switch external cvtres.exe for llvm's own resource library.""
This reverts commit 165e578e47f1cd38191120aad23a9020fb5476dd.
Forgot to run tests on this.
llvm-svn: 307190
Diffstat (limited to 'llvm/lib/Object/WindowsResource.cpp')
| -rw-r--r-- | llvm/lib/Object/WindowsResource.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/Object/WindowsResource.cpp b/llvm/lib/Object/WindowsResource.cpp index 7d1da37a634..f675a8389e6 100644 --- a/llvm/lib/Object/WindowsResource.cpp +++ b/llvm/lib/Object/WindowsResource.cpp @@ -328,7 +328,7 @@ private: std::unique_ptr<MemoryBuffer> OutputBuffer; char *BufferStart; uint64_t CurrentOffset = 0; - Machine MachineType; + COFF::MachineTypes MachineType; const WindowsResourceParser::TreeNode &Resources; const ArrayRef<std::vector<uint8_t>> Data; uint64_t FileSize; @@ -350,6 +350,7 @@ WindowsResourceCOFFWriter::WindowsResourceCOFFWriter( : MachineType(MachineType), Resources(Parser.getTree()), Data(Parser.getData()), StringTable(Parser.getStringTable()) { performFileLayout(); + OutputBuffer = MemoryBuffer::getNewMemBuffer(FileSize); } |
