diff src/share/vm/runtime/arguments.cpp @ 12182:bb57d48691f5

Merge
author tschatzl
date Thu, 05 Sep 2013 14:15:54 +0200
parents 4a1efab850f4 a701c16e8bbf
children 621eda7235d2 7944aba7ba41 ae3e68933caf
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Thu Sep 05 10:39:10 2013 +0200
+++ b/src/share/vm/runtime/arguments.cpp	Thu Sep 05 14:15:54 2013 +0200
@@ -1605,17 +1605,6 @@
   return result;
 }
 
-void Arguments::set_heap_base_min_address() {
-  if (FLAG_IS_DEFAULT(HeapBaseMinAddress) && UseG1GC && HeapBaseMinAddress < 1*G) {
-    // By default HeapBaseMinAddress is 2G on all platforms except Solaris x86.
-    // G1 currently needs a lot of C-heap, so on Solaris we have to give G1
-    // some extra space for the C-heap compared to other collectors.
-    // Use FLAG_SET_DEFAULT here rather than FLAG_SET_ERGO to make sure that
-    // code that checks for default values work correctly.
-    FLAG_SET_DEFAULT(HeapBaseMinAddress, 1*G);
-  }
-}
-
 void Arguments::set_heap_size() {
   if (!FLAG_IS_DEFAULT(DefaultMaxRAMFraction)) {
     // Deprecated flag
@@ -3537,8 +3526,6 @@
     }
   }
 
-  set_heap_base_min_address();
-
   // Set heap size based on available physical memory
   set_heap_size();