Mercurial > hg > graal-jvmci-8

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
23403:5342deb9bf53 23404:3ef45d0a6d77
110 #define VMLP "" 110 #define VMLP ""
111 #endif 111 #endif
112 112
113 #ifndef VMTYPE 113 #ifndef VMTYPE
114 #ifdef TIERED 114 #ifdef TIERED
115 #ifdef COMPILERJVMCI 115 #define VMTYPE "Server"
116 #define VMTYPE "JVMCI"
117 #else // COMPILERJVMCI
118 #define VMTYPE "Server"
119 #endif // COMPILERJVMCI
120 #else // TIERED 116 #else // TIERED
121 #ifdef ZERO 117 #ifdef ZERO
122 #ifdef SHARK 118 #ifdef SHARK
123 #define VMTYPE "Shark" 119 #define VMTYPE "Shark"
124 #else // SHARK 120 #else // SHARK
125 #define VMTYPE "Zero" 121 #define VMTYPE "Zero"
126 #endif // SHARK 122 #endif // SHARK
127 #else // ZERO 123 #else // ZERO
128 #define VMTYPE COMPILER1_PRESENT("Client") \ 124 #define VMTYPE COMPILER1_PRESENT("Client") \
129 COMPILER2_PRESENT("Server") \ 125 COMPILER2_PRESENT("Server")
130 COMPILERJVMCI_PRESENT("JVMCI")
131 #endif // ZERO 126 #endif // ZERO
132 #endif // TIERED 127 #endif // TIERED
133 #endif 128 #endif
134 129
135 #ifndef HOTSPOT_VM_DISTRO 130 #ifndef HOTSPOT_VM_DISTRO