commit 9dd08d912d7466ecd8b1923cd861010cbad51ff3
author Rui Ueyama <ruiu@google.com> Sat Jun 08 22:59:10 2013 +0000
committer Rui Ueyama <ruiu@google.com> Sat Jun 08 22:59:10 2013 +0000
tree 8b1c47ce47f119ae5edd3b23f3157d272f705470
parent f0b5384ef93974c2f2c006110beb87a32ca1caf1

[PECOFF][Driver] Add -heap command line option.

llvm-svn: 183622

lld/lib/ReaderWriter/PECOFF/PECOFFTargetInfo.cpp

diff --git a/lld/lib/ReaderWriter/PECOFF/PECOFFTargetInfo.cpp b/lld/lib/ReaderWriter/PECOFF/PECOFFTargetInfo.cpp
index a4c3e7e..e4bdf5a 100644
--- a/lld/lib/ReaderWriter/PECOFF/PECOFFTargetInfo.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/PECOFFTargetInfo.cpp
@@ -30,6 +30,13 @@
     return true;
   }
 
+  if (_heapReserve < _heapCommit) {
+    diagnostics << "Invalid heap size: reserve size must be equal to or "
+                << "greater than commit size, but got "
+                << _heapCommit << " and " << _heapReserve << ".\n";
+    return true;
+  }
+
   _reader = createReaderPECOFF(*this);
   _writer = createWriterPECOFF(*this);
   return false;

lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp

diff --git a/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp b/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp
index f8e4ae9..d25f799 100644
--- a/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp
@@ -157,8 +157,8 @@
 
     _peHeader.SizeOfStackReserve = targetInfo.getStackReserve();
     _peHeader.SizeOfStackCommit = targetInfo.getStackCommit();
-    _peHeader.SizeOfHeapReserve = 0x100000;
-    _peHeader.SizeOfHeapCommit = 0x1000;
+    _peHeader.SizeOfHeapReserve = targetInfo.getHeapReserve();
+    _peHeader.SizeOfHeapCommit = targetInfo.getHeapCommit();
 
     // The number of data directory entries. We always have 16 entries.
     _peHeader.NumberOfRvaAndSize = 16;