--- a/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Thu Jan 14 14:50:40 2016 +0100
+++ b/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Mon Jan 18 15:11:47 2016 +0100
@@ -630,9 +630,9 @@
     break;
   case JVMTI_VERBOSE_GC:
     if (value == 0) {
-      LogConfiguration::parse_log_arguments("stdout", "gc=off", NULL, NULL, NULL);
+      LogConfiguration::configure_stdout(LogLevel::Off, true, LOG_TAGS(gc));
     } else {
-      LogConfiguration::parse_log_arguments("stdout", "gc", NULL, NULL, NULL);
+      LogConfiguration::configure_stdout(LogLevel::Info, true, LOG_TAGS(gc));
     }
     break;
   case JVMTI_VERBOSE_JNI:

--- a/hotspot/src/share/vm/runtime/arguments.cpp	Thu Jan 14 14:50:40 2016 +0100
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Mon Jan 18 15:11:47 2016 +0100
@@ -2659,11 +2659,7 @@
           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;
-        }
+        LogConfiguration::configure_stdout(LogLevel::Info, true, LOG_TAGS(gc));
       } else if (!strcmp(tail, ":jni")) {
         if (FLAG_SET_CMDLINE(bool, PrintJNIResolving, true) != Flag::SUCCESS) {
           return JNI_EINVAL;

--- a/hotspot/src/share/vm/services/memoryService.cpp	Thu Jan 14 14:50:40 2016 +0100
+++ b/hotspot/src/share/vm/services/memoryService.cpp	Mon Jan 18 15:11:47 2016 +0100
@@ -519,9 +519,9 @@
   MutexLocker m(Management_lock);
   // verbose will be set to the previous value
   if (verbose) {
-    LogConfiguration::parse_log_arguments("stdout", "gc", NULL, NULL, NULL);
+    LogConfiguration::configure_stdout(LogLevel::Info, true, LOG_TAGS(gc));
   } else {
-    LogConfiguration::parse_log_arguments("stdout", "gc=off", NULL, NULL, NULL);
+    LogConfiguration::configure_stdout(LogLevel::Off, true, LOG_TAGS(gc));
   }
   ClassLoadingService::reset_trace_class_unloading();