Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/runtime/arguments.cpp	Fri Apr 03 10:12:57 2015 -0700
     1.2 +++ b/src/share/vm/runtime/arguments.cpp	Wed Apr 08 22:29:17 2015 -0400
     1.3 @@ -3837,8 +3837,8 @@
     1.4        CommandLineFlags::printFlags(tty, false);
     1.5        vm_exit(0);
     1.6      }
     1.7 +    if (match_option(option, "-XX:NativeMemoryTracking", &tail)) {
     1.8  #if INCLUDE_NMT
     1.9 -    if (match_option(option, "-XX:NativeMemoryTracking", &tail)) {
    1.10        // The launcher did not setup nmt environment variable properly.
    1.11        if (!MemTracker::check_launcher_nmt_support(tail)) {
    1.12          warning("Native Memory Tracking did not setup properly, using wrong launcher?");
    1.13 @@ -3853,8 +3853,12 @@
    1.14        } else {
    1.15          vm_exit_during_initialization("Syntax error, expecting -XX:NativeMemoryTracking=[off|summary|detail]", NULL);
    1.16        }
    1.17 +#else
    1.18 +      jio_fprintf(defaultStream::error_stream(),
    1.19 +        "Native Memory Tracking is not supported in this VM\n");
    1.20 +      return JNI_ERR;
    1.21 +#endif
    1.22      }
    1.23 -#endif
    1.24  
    1.25  
    1.26  #ifndef PRODUCT