src/share/vm/runtime/arguments.cpp

*** 2631,2641 ****
--- 2631,2645 ----
        IgnoreUnrecognizedVMOptions = true;
      }
      if (match_option(option, "-XX:-IgnoreUnrecognizedVMOptions", &tail)) {
        IgnoreUnrecognizedVMOptions = false;
      }
+     if (match_option(option, "-XX:+PrintFlagsInitial", &tail)) {
+       CommandLineFlags::printFlags();
+       vm_exit(0);
      }
+   }
  
    if (IgnoreUnrecognizedVMOptions) {
      // uncast const to modify the flag args->ignoreUnrecognized
      *(jboolean*)(&args->ignoreUnrecognized) = true;
    }
*** 2793,2807 ****
  
    if (PrintCommandLineFlags) {
      CommandLineFlags::printSetFlags();
    }
  
- #ifdef ASSERT
    if (PrintFlagsFinal) {
      CommandLineFlags::printFlags();
    }
- #endif
  
    return JNI_OK;
  }
  
  int Arguments::PropertyList_count(SystemProperty* pl) {
--- 2797,2809 ----