--- old/src/share/vm/runtime/arguments.cpp	2016-01-08 01:43:06.959061067 -0500
+++ new/src/share/vm/runtime/arguments.cpp	2016-01-08 01:43:06.791471529 -0500
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -402,6 +402,10 @@
 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" },
@@ -2655,16 +2659,19 @@
 
     // -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);
+        ret = LogConfiguration::parse_log_arguments("stdout", "gc", NULL, NULL, NULL);
         if (!ret) {
           return JNI_EINVAL;
         }