--- a/hotspot/src/share/vm/memory/filemap.cpp	Tue May 03 09:09:20 2016 +0100
+++ b/hotspot/src/share/vm/memory/filemap.cpp	Fri May 06 06:12:56 2016 -0700
@@ -99,7 +99,8 @@
       fail(msg, ap);
     } else {
       if (PrintSharedSpaces) {
-        tty->print_cr("UseSharedSpaces: %s", msg);
+        tty->print("UseSharedSpaces: ");
+        tty->vprint_cr(msg, ap);
       }
     }
     UseSharedSpaces = false;
@@ -208,7 +209,7 @@
         count ++;
         bytes += (int)entry_size;
         bytes += name_bytes;
-        log_info(classpath)("add main shared path (%s) %s", (cpe->is_jar_file() ? "jar" : "dir"), name);
+        log_info(class, path)("add main shared path (%s) %s", (cpe->is_jar_file() ? "jar" : "dir"), name);
       } else {
         SharedClassPathEntry* ent = shared_classpath(cur_entry);
         if (cpe->is_jar_file()) {
@@ -282,7 +283,7 @@
     struct stat st;
     const char* name = ent->_name;
     bool ok = true;
-    log_info(classpath)("checking shared classpath entry: %s", name);
+    log_info(class, path)("checking shared classpath entry: %s", name);
     if (os::stat(name, &st) != 0) {
       fail_continue("Required classpath entry does not exist: %s", name);
       ok = false;
@@ -306,7 +307,7 @@
       }
     }
     if (ok) {
-      log_info(classpath)("ok");
+      log_info(class, path)("ok");
     } else if (!PrintSharedArchiveAndExit) {
       _validating_classpath_entry_table = false;
       return false;
@@ -896,8 +897,8 @@
   char header_version[JVM_IDENT_MAX];
   get_header_version(header_version);
   if (strncmp(_jvm_ident, header_version, JVM_IDENT_MAX-1) != 0) {
-    log_info(classpath)("expected: %s", header_version);
-    log_info(classpath)("actual:   %s", _jvm_ident);
+    log_info(class, path)("expected: %s", header_version);
+    log_info(class, path)("actual:   %s", _jvm_ident);
     FileMapInfo::fail_continue("The shared archive file was created by a different"
                   " version or build of HotSpot");
     return false;
@@ -925,7 +926,7 @@
   if (status) {
     if (!ClassLoader::check_shared_paths_misc_info(_paths_misc_info, _header->_paths_misc_info_size)) {
       if (!PrintSharedArchiveAndExit) {
-        fail_continue("shared class paths mismatch (hint: enable -Xlog:classpath=info to diagnose the failure)");
+        fail_continue("shared class paths mismatch (hint: enable -Xlog:class+path=info to diagnose the failure)");
         status = false;
       }
     }