diff options
| author | Eric Beckmann <ecbeckmann@google.com> | 2017-07-05 18:59:16 +0000 |
|---|---|---|
| committer | Eric Beckmann <ecbeckmann@google.com> | 2017-07-05 18:59:16 +0000 |
| commit | 36793a0ecf30a4382a1626ca8fdd76117b0c5945 (patch) | |
| tree | e3c196ab542f9db966975c2c57712afe77411a29 /llvm/lib/Object | |
| parent | 8cc9fd31e64981d2c1aaf71d7b05ea928ef499f6 (diff) | |
| download | bcm5719-llvm-36793a0ecf30a4382a1626ca8fdd76117b0c5945.tar.gz bcm5719-llvm-36793a0ecf30a4382a1626ca8fdd76117b0c5945.zip | |
Revert "Switch external cvtres.exe for llvm's own resource library."
This reverts commit 600d52c278e123dd08bee24c1f00932b55add8de.
This patch still seems to break CrWinClangLLD, reverting until I can
find root problem.
llvm-svn: 307189
Diffstat (limited to 'llvm/lib/Object')
| -rw-r--r-- | llvm/lib/Object/WindowsResource.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/llvm/lib/Object/WindowsResource.cpp b/llvm/lib/Object/WindowsResource.cpp index f675a8389e6..7d1da37a634 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; - COFF::MachineTypes MachineType; + Machine MachineType; const WindowsResourceParser::TreeNode &Resources; const ArrayRef<std::vector<uint8_t>> Data; uint64_t FileSize; @@ -350,7 +350,6 @@ WindowsResourceCOFFWriter::WindowsResourceCOFFWriter( : MachineType(MachineType), Resources(Parser.getTree()), Data(Parser.getData()), StringTable(Parser.getStringTable()) { performFileLayout(); - OutputBuffer = MemoryBuffer::getNewMemBuffer(FileSize); } |
