--- old/src/share/vm/runtime/arguments.hpp	2015-01-12 17:07:02.247150429 -0500
+++ new/src/share/vm/runtime/arguments.hpp	2015-01-12 17:07:01.803124702 -0500
@@ -430,7 +430,21 @@
   // been made obsolete.  If we detect one of these flags on the command
   // line, instead of failing we print a warning message and ignore the
   // flag.  This gives the user a release or so to stop using the flag.
-  static bool is_newly_obsolete(const char* s, JDK_Version* buffer);
+  static bool is_newly_obsolete(const char* s, JDK_Version* version);
+  
+// Returns 1 if the flag is deprecated and jdk version is in the range specified.
+//     In this case the 'version' buffer is filled in with the version number when the flag became
+//     deprecated so that that value can be displayed to the user.
+// Returns -1 if the flag is deprecated and and has expired (should be ignored))
+// Returns 0 if the flag is not deprecated.
+  static int is_deprecated_flag(const char* s, JDK_Version* version);
+
+  // Support option aliases.
+  // Return the real name for the flag passed on the command line.
+  static const char* real_flag_name(const char *flag_name);
+  
+  // return the "real" name for option arg, and print warnings if arg is deprecated.
+  static const char* handle_aliases_and_deprecation(const char* arg);
 
   static short  CompileOnlyClassesNum;
   static short  CompileOnlyClassesMax;
@@ -474,7 +488,6 @@
   // Check for consistency in the selection of the garbage collector.
   static bool check_gc_consistency_user();        // Check user-selected gc
   static inline bool check_gc_consistency_ergo(); // Check ergonomic-selected gc
-  static void check_deprecated_gc_flags();
   // Check consistency or otherwise of VM argument settings
   static bool check_vm_args_consistency();
   // Check stack pages settings