--- old/src/share/vm/runtime/arguments.hpp	2016-01-11 11:51:31.901522020 -0500
+++ new/src/share/vm/runtime/arguments.hpp	2016-01-11 11:51:31.719088576 -0500
@@ -30,7 +30,8 @@
 #include "runtime/perfData.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/top.hpp"
-
+#include "logging/logTag.hpp"
+#include "logging/logLevel.hpp"
 // Arguments parses the command line and recognizes options
 
 // Invocation API hook typedefs (these should really be defined in jni.hpp)
@@ -223,6 +224,14 @@
 // Helper class for controlling the lifetime of JavaVMInitArgs objects.
 class ScopedVMInitArgs;
 
+// Most logging functions require 5 tags. Some of them may be _NO_TAG.
+typedef struct {
+  const char* alias_name;
+  LogLevelType level;
+  bool exactMatch;
+  LogTagType tag;
+} AliasedLoggingFlag;
+
 class Arguments : AllStatic {
   friend class VMStructs;
   friend class JvmtiExport;
@@ -446,7 +455,7 @@
   // Return NULL if the arg has expired.
   static const char* handle_aliases_and_deprecation(const char* arg, bool warn);
   static bool lookup_logging_aliases(const char* arg, char* buffer);
-
+  static AliasedLoggingFlag catch_logging_aliases(const char* name);
   static short  CompileOnlyClassesNum;
   static short  CompileOnlyClassesMax;
   static char** CompileOnlyClasses;