Mercurial > hg > truffle
diff src/share/vm/runtime/arguments.cpp @ 6158:f9d57285de70
Merge
author | asaha |
---|---|
date | Thu, 07 Jun 2012 12:30:02 -0700 |
parents | 84e198dc2474 cdeda3fd141e |
children | 3759236eea14 24b9c7f4cae6 |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Mon May 21 14:56:33 2012 -0700 +++ b/src/share/vm/runtime/arguments.cpp Thu Jun 07 12:30:02 2012 -0700 @@ -3041,7 +3041,7 @@ return result; } -#ifdef JAVASE_EMBEDDED +#if (defined JAVASE_EMBEDDED || defined ARM) UNSUPPORTED_OPTION(UseG1GC, "G1 GC"); #endif @@ -3094,6 +3094,14 @@ PrintGC = true; } + if (!JDK_Version::is_gte_jdk18x_version()) { + // To avoid changing the log format for 7 updates this flag is only + // true by default in JDK8 and above. + if (FLAG_IS_DEFAULT(PrintGCCause)) { + FLAG_SET_DEFAULT(PrintGCCause, false); + } + } + // Set object alignment values. set_object_alignment();