Merge
authordholmes
Sun, 30 Oct 2011 18:40:48 -0700
changeset 10829 dfedb42b9075
parent 10827 e8c62dff4701 (current diff)
parent 10828 083151731200 (diff)
child 10830 f3fedfa29811
Merge
--- a/hotspot/src/share/vm/runtime/globals.hpp	Fri Oct 28 18:30:47 2011 -0700
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Sun Oct 30 18:40:48 2011 -0700
@@ -2580,7 +2580,7 @@
   diagnostic(bool, DebugInlinedCalls, true,                                 \
          "If false, restricts profiled locations to the root method only")  \
                                                                             \
-  product(bool, PrintVMOptions, trueInDebug,                                \
+  product(bool, PrintVMOptions, NOT_EMBEDDED(trueInDebug) EMBEDDED_ONLY(false),\
          "Print flags that appeared on the command line")                   \
                                                                             \
   product(bool, IgnoreUnrecognizedVMOptions, false,                         \