*** old/src/share/vm/runtime/arguments.cpp	Fri Jan  8 01:43:06 2016
--- new/src/share/vm/runtime/arguments.cpp	Fri Jan  8 01:43:06 2016

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 400,409 ****
--- 400,413 ----
  };
  
  static AliasedFlag const aliased_jvm_logging_flags[] = {
    { "-XX:+TraceClassResolution", "-Xlog:classresolve=info"},
    { "-XX:-TraceClassResolution", "-Xlog:classresolve=off"},
+   { "-XX:+TraceClassLoading", "-Xlog:classload=info"},
+   { "-XX:-TraceClassLoading", "-Xlog:classload=off"},
+   { "-XX:+TraceClassUnloading", "-Xlog:classunload=info"},
+   { "-XX:-TraceClassUnloading", "-Xlog:classunload=off"},
    { "-XX:+TraceExceptions", "-Xlog:exceptions=info" },
    { "-XX:-TraceExceptions", "-Xlog:exceptions=off" },
    { "-XX:+TraceMonitorInflation", "-Xlog:monitorinflation=debug" },
    { "-XX:-TraceMonitorInflation", "-Xlog:monitorinflation=off" },
    { NULL, NULL }

*** 2653,2672 ****
--- 2657,2679 ----
        }
      }
  
      // -verbose:[class/gc/jni]
      if (match_option(option, "-verbose", &tail)) {
+       bool ret;
        if (!strcmp(tail, ":class") || !strcmp(tail, "")) {
          if (FLAG_SET_CMDLINE(bool, TraceClassLoading, true) != Flag::SUCCESS) {
+         ret = LogConfiguration::parse_log_arguments("stdout", "classload=info", NULL, NULL, NULL);
+         if (!ret) {
            return JNI_EINVAL;
          }
          if (FLAG_SET_CMDLINE(bool, TraceClassUnloading, true) != Flag::SUCCESS) {
+         ret = LogConfiguration::parse_log_arguments("stdout", "classunload=info", NULL, NULL, NULL);
+         if (!ret) {
            return JNI_EINVAL;
          }
        } else if (!strcmp(tail, ":gc")) {
          // LogConfiguration_lock is not set up yet, but this code is executed by a single thread
-         bool ret = LogConfiguration::parse_log_arguments("stdout", "gc", NULL, NULL, NULL);
          if (!ret) {
            return JNI_EINVAL;
          }
        } else if (!strcmp(tail, ":jni")) {
          if (FLAG_SET_CMDLINE(bool, PrintJNIResolving, true) != Flag::SUCCESS) {