--- a/hotspot/src/share/vm/runtime/arguments.cpp Mon May 21 14:56:33 2012 -0700
+++ b/hotspot/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();