# HG changeset patch
# User rehn
# Date 1489489202 -3600
# Node ID 1b3fc837aa319dab73a93480f0564ddc455ce8ea
# Parent  27047c8fa964b830e51ae110b3b78fd92f12752f
8176098: Deprecate FlatProfiler
Reviewed-by: shade, coleenp

diff -r 27047c8fa964 -r 1b3fc837aa31 hotspot/src/share/vm/Xusage.txt
--- a/hotspot/src/share/vm/Xusage.txt	Mon Mar 13 23:36:14 2017 -0700
+++ b/hotspot/src/share/vm/Xusage.txt	Tue Mar 14 12:00:02 2017 +0100
@@ -12,7 +12,7 @@
     -Xms<size>        set initial Java heap size
     -Xmx<size>        set maximum Java heap size
     -Xss<size>        set java thread stack size
-    -Xprof            output cpu profiling data
+    -Xprof            output cpu profiling data (deprecated)
     -Xfuture          enable strictest checks, anticipating future default
     -Xrs              reduce use of OS signals by Java/VM (see documentation)
     -Xcheck:jni       perform additional checks for JNI functions
diff -r 27047c8fa964 -r 1b3fc837aa31 hotspot/src/share/vm/runtime/arguments.cpp
--- a/hotspot/src/share/vm/runtime/arguments.cpp	Mon Mar 13 23:36:14 2017 -0700
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Tue Mar 14 12:00:02 2017 +0100
@@ -3174,6 +3174,7 @@
     // -Xprof
     } else if (match_option(option, "-Xprof")) {
 #if INCLUDE_FPROF
+      log_warning(arguments)("Option -Xprof was deprecated in version 9 and will likely be removed in a future release.");
       _has_profile = true;
 #else // INCLUDE_FPROF
       jio_fprintf(defaultStream::error_stream(),