# HG changeset patch
# User dholmes
# Date 1428472874 0
# Node ID 501167dc42a29135ff1d325baccf751c47d1b8c0
# Parent  2d8a6a2ee2794748c915e985bf7643e993c71acf# Parent  cee8d786f3f99e7903df428a1040ea3afafb8abd
Merge

diff -r 2d8a6a2ee279 -r 501167dc42a2 hotspot/src/share/vm/runtime/arguments.cpp
--- a/hotspot/src/share/vm/runtime/arguments.cpp	Tue Apr 07 20:18:28 2015 -0700
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Wed Apr 08 06:01:14 2015 +0000
@@ -3714,8 +3714,8 @@
       CommandLineFlags::printFlags(tty, false);
       vm_exit(0);
     }
+    if (match_option(option, "-XX:NativeMemoryTracking", &tail)) {
 #if INCLUDE_NMT
-    if (match_option(option, "-XX:NativeMemoryTracking", &tail)) {
       // The launcher did not setup nmt environment variable properly.
       if (!MemTracker::check_launcher_nmt_support(tail)) {
         warning("Native Memory Tracking did not setup properly, using wrong launcher?");
@@ -3731,9 +3731,12 @@
         vm_exit_during_initialization("Syntax error, expecting -XX:NativeMemoryTracking=[off|summary|detail]", NULL);
       }
       continue;
-    }
+#else
+      jio_fprintf(defaultStream::error_stream(),
+        "Native Memory Tracking is not supported in this VM\n");
+      return JNI_ERR;
 #endif
-
+    }
 
 #ifndef PRODUCT
     if (match_option(option, "-XX:+PrintFlagsWithComments")) {