equal
deleted
inserted
replaced
3039 jint result = parse_vm_init_args(args); |
3039 jint result = parse_vm_init_args(args); |
3040 if (result != JNI_OK) { |
3040 if (result != JNI_OK) { |
3041 return result; |
3041 return result; |
3042 } |
3042 } |
3043 |
3043 |
3044 #ifdef JAVASE_EMBEDDED |
3044 #if (defined JAVASE_EMBEDDED || defined ARM) |
3045 UNSUPPORTED_OPTION(UseG1GC, "G1 GC"); |
3045 UNSUPPORTED_OPTION(UseG1GC, "G1 GC"); |
3046 #endif |
3046 #endif |
3047 |
3047 |
3048 #ifndef PRODUCT |
3048 #ifndef PRODUCT |
3049 if (TraceBytecodesAt != 0) { |
3049 if (TraceBytecodesAt != 0) { |
3090 } |
3090 } |
3091 |
3091 |
3092 if (PrintGCDetails) { |
3092 if (PrintGCDetails) { |
3093 // Turn on -verbose:gc options as well |
3093 // Turn on -verbose:gc options as well |
3094 PrintGC = true; |
3094 PrintGC = true; |
|
3095 } |
|
3096 |
|
3097 if (!JDK_Version::is_gte_jdk18x_version()) { |
|
3098 // To avoid changing the log format for 7 updates this flag is only |
|
3099 // true by default in JDK8 and above. |
|
3100 if (FLAG_IS_DEFAULT(PrintGCCause)) { |
|
3101 FLAG_SET_DEFAULT(PrintGCCause, false); |
|
3102 } |
3095 } |
3103 } |
3096 |
3104 |
3097 // Set object alignment values. |
3105 // Set object alignment values. |
3098 set_object_alignment(); |
3106 set_object_alignment(); |
3099 |
3107 |