1.1 --- a/src/share/vm/runtime/arguments.cpp Thu Oct 10 13:25:51 2013 -0700
1.2 +++ b/src/share/vm/runtime/arguments.cpp Fri Oct 11 08:27:21 2013 -0700
1.3 @@ -2657,16 +2657,16 @@
1.4 FLAG_SET_CMDLINE(bool, BackgroundCompilation, false);
1.5 // -Xmn for compatibility with other JVM vendors
1.6 } else if (match_option(option, "-Xmn", &tail)) {
1.7 - julong long_initial_eden_size = 0;
1.8 - ArgsRange errcode = parse_memory_size(tail, &long_initial_eden_size, 1);
1.9 + julong long_initial_young_size = 0;
1.10 + ArgsRange errcode = parse_memory_size(tail, &long_initial_young_size, 1);
1.11 if (errcode != arg_in_range) {
1.12 jio_fprintf(defaultStream::error_stream(),
1.13 - "Invalid initial eden size: %s\n", option->optionString);
1.14 + "Invalid initial young generation size: %s\n", option->optionString);
1.15 describe_range_error(errcode);
1.16 return JNI_EINVAL;
1.17 }
1.18 - FLAG_SET_CMDLINE(uintx, MaxNewSize, (uintx)long_initial_eden_size);
1.19 - FLAG_SET_CMDLINE(uintx, NewSize, (uintx)long_initial_eden_size);
1.20 + FLAG_SET_CMDLINE(uintx, MaxNewSize, (uintx)long_initial_young_size);
1.21 + FLAG_SET_CMDLINE(uintx, NewSize, (uintx)long_initial_young_size);
1.22 // -Xms
1.23 } else if (match_option(option, "-Xms", &tail)) {
1.24 julong long_initial_heap_size = 0;
1.25 @@ -3666,6 +3666,9 @@
1.26 assert(verify_serial_gc_flags(), "SerialGC unset");
1.27 #endif // INCLUDE_ALL_GCS
1.28
1.29 + // Initialize Metaspace flags and alignments.
1.30 + Metaspace::ergo_initialize();
1.31 +
1.32 // Set bytecode rewriting flags
1.33 set_bytecode_flags();
1.34
