src/share/vm/runtime/globals.hpp

*** 209,219 ****
  
    // Returns false if name is not a command line flag.
    static bool wasSetOnCmdline(const char* name, bool* value);
    static void printSetFlags();
  
!   static void printFlags() PRODUCT_RETURN;
  
    static void verify() PRODUCT_RETURN;
  };
  
  // use this for flags that are true by default in the debug version but
--- 209,219 ----
  
    // Returns false if name is not a command line flag.
    static bool wasSetOnCmdline(const char* name, bool* value);
    static void printSetFlags();
  
!   static void printFlags();
  
    static void verify() PRODUCT_RETURN;
  };
  
  // use this for flags that are true by default in the debug version but
*** 325,337 ****
     * removal testing.  It was supposed to be removed before FCS but has     \
     * been re-added (see 6401008) */                                         \
    product(bool, UseMembar, false,                                           \
            "(Unstable) Issues membars on thread state transitions")          \
                                                                              \
-   product(bool, PrintCommandLineFlags, false,                               \
-           "Prints flags that appeared on the command line")                 \
-                                                                             \
    diagnostic(bool, UnlockDiagnosticVMOptions, trueInDebug,                  \
            "Enable normal processing of flags relating to field diagnostics")\
                                                                              \
    experimental(bool, UnlockExperimentalVMOptions, false,                    \
            "Enable normal processing of flags relating to experimental features")\
--- 325,334 ----
*** 1965,1977 ****
                                                                              \
    product(uintx, CMSYieldSleepCount, 0,                                     \
            "number of times a GC thread (minus the coordinator) "            \
            "will sleep while yielding before giving up and resuming GC")     \
                                                                              \
-   notproduct(bool, PrintFlagsFinal, false,                                  \
-           "Print all command line flags after argument processing")         \
-                                                                             \
    /* gc tracing */                                                          \
    manageable(bool, PrintGC, false,                                          \
            "Print message at garbage collect")                               \
                                                                              \
    manageable(bool, PrintGCDetails, false,                                   \
--- 1962,1971 ----
*** 2267,2281 ****
                                                                              \
    diagnostic(bool, DebugInlinedCalls, true,                                 \
           "If false, restricts profiled locations to the root method only")  \
                                                                              \
    product(bool, PrintVMOptions, trueInDebug,                                \
!          "print VM flag settings")                                          \
                                                                              \
    product(bool, IgnoreUnrecognizedVMOptions, false,                         \
           "Ignore unrecognized VM options")                                  \
                                                                              \
    diagnostic(bool, SerializeVMOutput, true,                                 \
           "Use a mutex to serialize output to tty and hotspot.log")          \
                                                                              \
    diagnostic(bool, DisplayVMOutput, true,                                   \
           "Display all VM output on the tty, independently of LogVMOutput")  \
--- 2261,2284 ----
                                                                              \
    diagnostic(bool, DebugInlinedCalls, true,                                 \
           "If false, restricts profiled locations to the root method only")  \
                                                                              \
    product(bool, PrintVMOptions, trueInDebug,                                \
!          "Print flags that appeared on the command line")                   \
                                                                              \
    product(bool, IgnoreUnrecognizedVMOptions, false,                         \
           "Ignore unrecognized VM options")                                  \
                                                                              \
+   product(bool, PrintCommandLineFlags, false,                               \
+          "Print flags specified on command line or set by ergonomic")       \
+                                                                             \
+   product(bool, PrintFlagsInitial, false,                                   \
+          "Print all VM flags before arguments processing")                  \
+                                                                             \
+   product(bool, PrintFlagsFinal, false,                                     \
+          "Print all VM flags after arguments processing and ergonomic")     \
+                                                                             \
    diagnostic(bool, SerializeVMOutput, true,                                 \
           "Use a mutex to serialize output to tty and hotspot.log")          \
                                                                              \
    diagnostic(bool, DisplayVMOutput, true,                                   \
           "Display all VM output on the tty, independently of LogVMOutput")  \