Automatic merge of jdk:master into master

duke · duke · commit 8ca9c80a2b82 · 2021-03-23T01:19:11.000Z
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
@@ -3438,7 +3438,7 @@ char* Arguments::get_default_shared_archive_path() {
   const size_t len = jvm_path_len + file_sep_len + 20;
   default_archive_path = NEW_C_HEAP_ARRAY(char, len, mtArguments);
   jio_snprintf(default_archive_path, len,
-               UseCompressedOops ? "%s%sclasses.jsa": "%s%sclasses_nocoops.jsa",
+               LP64_ONLY(!UseCompressedOops ? "%s%sclasses_nocoops.jsa":) "%s%sclasses.jsa",
                jvm_path, os::file_separator());
   return default_archive_path;
 }

Original file line number	Diff line number	Diff line change
`@@ -3438,7 +3438,7 @@ char* Arguments::get_default_shared_archive_path() {`
`3438`	`3438`	`const size_t len = jvm_path_len + file_sep_len + 20;`
`3439`	`3439`	`default_archive_path = NEW_C_HEAP_ARRAY(char, len, mtArguments);`
`3440`	`3440`	`jio_snprintf(default_archive_path, len,`
`3441`		`- UseCompressedOops ? "%s%sclasses.jsa": "%s%sclasses_nocoops.jsa",`
	`3441`	`+ LP64_ONLY(!UseCompressedOops ? "%s%sclasses_nocoops.jsa":) "%s%sclasses.jsa",`
`3442`	`3442`	`jvm_path, os::file_separator());`
`3443`	`3443`	`return default_archive_path;`
`3444`	`3444`	`}`