diff src/share/vm/runtime/globals.hpp @ 7226:8a3efb8c831d

Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Fri, 14 Dec 2012 13:02:49 +0100
parents 7c5f7e7cf2c2 5d0bb7d52783
children 989155e2d07a
line wrap: on
line diff
--- a/src/share/vm/runtime/globals.hpp	Fri Dec 14 12:05:35 2012 +0100
+++ b/src/share/vm/runtime/globals.hpp	Fri Dec 14 13:02:49 2012 +0100
@@ -1219,6 +1219,9 @@
   notproduct(bool, TraceJVMCalls, false,                                    \
           "Trace JVM calls")                                                \
                                                                             \
+  product(bool, TraceSignals, false,                                        \
+          "Trace signals and implicit exception handling")                  \
+                                                                            \
   product(ccstr, TraceJVMTI, NULL,                                          \
           "Trace flags for JVMTI functions and events")                     \
                                                                             \
@@ -2373,7 +2376,7 @@
   product(intx, CICompilerCount, CI_COMPILER_COUNT,                         \
           "Number of compiler threads to run")                              \
                                                                             \
-  product(intx, CompilationPolicyChoice, NOT_GRAAL(0) GRAAL_ONLY(4),        \
+  product(intx, CompilationPolicyChoice, NOT_GRAALVM(0) GRAALVM_ONLY(4),    \
           "which compilation policy (0/1)")                                 \
                                                                             \
   develop(bool, UseStackBanging, true,                                      \