1.1 --- a/src/share/vm/runtime/arguments.cpp Fri Jan 04 17:04:46 2013 -0800
1.2 +++ b/src/share/vm/runtime/arguments.cpp Wed Jan 09 18:06:34 2013 -0500
1.3 @@ -1326,14 +1326,14 @@
1.4 // then a saved space from compressed oops.
1.5 if ((int)ObjectAlignmentInBytes > 256) {
1.6 jio_fprintf(defaultStream::error_stream(),
1.7 - "error: ObjectAlignmentInBytes=%d must not be greater then 256\n",
1.8 + "error: ObjectAlignmentInBytes=%d must not be greater than 256\n",
1.9 (int)ObjectAlignmentInBytes);
1.10 return false;
1.11 }
1.12 // In case page size is very small.
1.13 if ((int)ObjectAlignmentInBytes >= os::vm_page_size()) {
1.14 jio_fprintf(defaultStream::error_stream(),
1.15 - "error: ObjectAlignmentInBytes=%d must be less then page size %d\n",
1.16 + "error: ObjectAlignmentInBytes=%d must be less than page size %d\n",
1.17 (int)ObjectAlignmentInBytes, os::vm_page_size());
1.18 return false;
1.19 }
1.20 @@ -3010,11 +3010,6 @@
1.21 FLAG_SET_DEFAULT(UseLargePages, false);
1.22 }
1.23
1.24 - // Add 2M to any size for SharedReadOnlySize to get around the JPRT setting
1.25 - if (DumpSharedSpaces && !FLAG_IS_DEFAULT(SharedReadOnlySize)) {
1.26 - SharedReadOnlySize = 14*M;
1.27 - }
1.28 -
1.29 if (DumpSharedSpaces) {
1.30 if (RequireSharedSpaces) {
1.31 warning("cannot dump shared archive while using shared archive");
1.32 @@ -3051,7 +3046,6 @@
1.33 strcpy(shared_archive_path, jvm_path);
1.34 strcat(shared_archive_path, os::file_separator());
1.35 strcat(shared_archive_path, "classes");
1.36 - DEBUG_ONLY(strcat(shared_archive_path, "_g");)
1.37 strcat(shared_archive_path, ".jsa");
1.38 SharedArchivePath = shared_archive_path;
1.39
