# HG changeset patch
# User rehn
# Date 1489160023 -3600
#      Fri Mar 10 16:33:43 2017 +0100
# Node ID 513e4f6e7f088521c8c6d3713a168b11978bc7bb
# Parent  6868eb69ce706d4e85d30a23edc20bd090bc71ba
imported patch 8176098

diff --git a/src/share/vm/Xusage.txt b/src/share/vm/Xusage.txt
--- a/src/share/vm/Xusage.txt
+++ b/src/share/vm/Xusage.txt
@@ -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 --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp
+++ b/src/share/vm/runtime/arguments.cpp
@@ -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(),