summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--V8_MERGE_REVISION2
-rw-r--r--src/heap.cc12
2 files changed, 10 insertions, 4 deletions
diff --git a/V8_MERGE_REVISION b/V8_MERGE_REVISION
index 0b33891a..612a1142 100644
--- a/V8_MERGE_REVISION
+++ b/V8_MERGE_REVISION
@@ -1,2 +1,4 @@
V8 3.9.24.29
http://v8.googlecode.com/svn/branches/3.9@11646
+
+Note local edits to src/heap.cc, see http://codereview.chromium.org/10541053/
diff --git a/src/heap.cc b/src/heap.cc
index 48e8b567..f2e2bc08 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -67,10 +67,14 @@ Heap::Heap()
: isolate_(NULL),
// semispace_size_ should be a power of 2 and old_generation_size_ should be
// a multiple of Page::kPageSize.
-#if defined(ANDROID)
-#define LUMP_OF_MEMORY (128 * KB)
- code_range_size_(0),
-#elif defined(V8_TARGET_ARCH_X64)
+
+// ANDROID
+//#if defined(ANDROID)
+//#define LUMP_OF_MEMORY (128 * KB)
+// code_range_size_(0),
+//#elif defined(V8_TARGET_ARCH_X64)
+// END ANDROID
+#if defined(V8_TARGET_ARCH_X64)
#define LUMP_OF_MEMORY (2 * MB)
code_range_size_(512*MB),
#else