Mercurial > hg > release > icedtea7-forest-2.5 > hotspot
changeset 4805:12019d9953a8
Merge
author | brutisso |
---|---|
date | Sat, 29 Jun 2013 01:23:27 +0200 |
parents | 4ebc4781f877 (current diff) 1dad4752d5f7 (diff) |
children | 9a72ee84e61b |
files | |
diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Fri Jun 28 00:52:15 2013 -0700 +++ b/src/share/vm/runtime/arguments.cpp Sat Jun 29 01:23:27 2013 +0200 @@ -1505,7 +1505,9 @@ // 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. - FLAG_SET_ERGO(uintx, HeapBaseMinAddress, 1*G); + // 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); } }