diff src/share/vm/runtime/vm_version.cpp @ 23404:3ef45d0a6d77

Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
author Roland Schatz <roland.schatz@oracle.com>
date Tue, 24 May 2016 13:51:28 +0200
parents dd9cc155639c
children 719853999215
line wrap: on
line diff
--- a/src/share/vm/runtime/vm_version.cpp	Fri May 20 15:49:00 2016 +0200
+++ b/src/share/vm/runtime/vm_version.cpp	Tue May 24 13:51:28 2016 +0200
@@ -112,11 +112,7 @@
 
 #ifndef VMTYPE
   #ifdef TIERED
-    #ifdef COMPILERJVMCI
-      #define VMTYPE "JVMCI"
-    #else // COMPILERJVMCI
-      #define VMTYPE "Server"
-    #endif // COMPILERJVMCI
+    #define VMTYPE "Server"
   #else // TIERED
     #ifdef ZERO
       #ifdef SHARK
@@ -126,8 +122,7 @@
       #endif // SHARK
     #else // ZERO
       #define VMTYPE COMPILER1_PRESENT("Client")   \
-                     COMPILER2_PRESENT("Server")   \
-                     COMPILERJVMCI_PRESENT("JVMCI")
+                     COMPILER2_PRESENT("Server")
     #endif // ZERO
   #endif // TIERED
 #endif