# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1391682033 -3600
# Node ID 4cbe077ab49a5546c339a4bc6a79295b6a37203b
# Parent  6a030a69c3d8631a95d3ee3fa5aa458b00322d0c
removed UseHSAILSimulator option

diff -r 6a030a69c3d8 -r 4cbe077ab49a src/os/linux/vm/gpu_linux.cpp
--- a/src/os/linux/vm/gpu_linux.cpp	Thu Feb 06 11:17:58 2014 +0100
+++ b/src/os/linux/vm/gpu_linux.cpp	Thu Feb 06 11:20:33 2014 +0100
@@ -42,7 +42,7 @@
   bool hsail = false;
   bool ptx = false;
 
-  if (UseHSAILSimulator && Hsail::register_natives(env)) {
+  if (Hsail::register_natives(env)) {
     hsail = true;
   }
 
diff -r 6a030a69c3d8 -r 4cbe077ab49a src/os/windows/vm/gpu_windows.cpp
--- a/src/os/windows/vm/gpu_windows.cpp	Thu Feb 06 11:17:58 2014 +0100
+++ b/src/os/windows/vm/gpu_windows.cpp	Thu Feb 06 11:20:33 2014 +0100
@@ -29,7 +29,7 @@
 
 jobject gpu::probe_gpus(JNIEnv* env) {
   // TODO: add detection of PTX/NVidia
-  if (UseHSAILSimulator && Hsail::register_natives(env)) {
+  if (Hsail::register_natives(env)) {
     return env->NewStringUTF("HSAIL");
   }
   return env->NewStringUTF("");
diff -r 6a030a69c3d8 -r 4cbe077ab49a src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Thu Feb 06 11:17:58 2014 +0100
+++ b/src/share/vm/runtime/globals.hpp	Thu Feb 06 11:20:33 2014 +0100
@@ -3840,9 +3840,6 @@
   product(bool , AllowNonVirtualCalls, false,                               \
           "Obey the ACC_SUPER flag and allow invokenonvirtual calls")       \
                                                                             \
-  product(bool, UseHSAILSimulator, false,                                   \
-          "Run code on HSAIL Simulator")                                    \
-                                                                            \
   diagnostic(ccstr, SharedArchiveFile, NULL,                                \
           "Override the default location of the CDS archive file")          \
                                                                             \