--- a/hotspot/src/share/vm/runtime/globals.hpp	Tue Dec 08 20:51:09 2015 -0500
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Wed Dec 09 15:31:25 2015 +0530
@@ -1423,6 +1423,13 @@
           range(500, max_intx)                                              \
           constraint(BiasedLockingDecayTimeFunc,AfterErgo)                  \
                                                                             \
+  product(bool, ExitOnOutOfMemoryError, false,                              \
+          "JVM exits on the first occurrence of an out-of-memory error")    \
+                                                                            \
+  product(bool, CrashOnOutOfMemoryError, false,                             \
+          "JVM aborts, producing an error log and core/mini dump, on the "  \
+          "first occurrence of an out-of-memory error")                     \
+                                                                            \
   /* tracing */                                                             \
                                                                             \
   develop(bool, StressRewriter, false,                                      \