Mercurial > hg > graal-compiler

comparison src/share/vm/runtime/vm_version.cpp @ 14124:7ad529321294

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make: remove GRAALVM and introduce COMPILERGRAAL. fix client hosted-mode
author Bernhard Urban <bernhard.urban@jku.at>
date Mon, 10 Mar 2014 16:26:10 +0100
parents 800057208a2c
children d8041d695d19
comparison
equal deleted inserted replaced
14123:dc41eab09fe8 14124:7ad529321294
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 GRAAL 115 #ifdef COMPILERGRAAL
116 #define VMTYPE "Graal" 116 #define VMTYPE "Graal"
117 #else 117 #else // COMPILERGRAAL
118 #define VMTYPE "Server" 118 #define VMTYPE "Server"
119 #endif 119 #endif // COMPILERGRAAL
120 #else // TIERED 120 #else // TIERED
121 #ifdef ZERO 121 #ifdef ZERO
122 #ifdef SHARK 122 #ifdef SHARK
123 #define VMTYPE "Shark" 123 #define VMTYPE "Shark"
124 #else // SHARK 124 #else // SHARK
125 #define VMTYPE "Zero" 125 #define VMTYPE "Zero"
126 #endif // SHARK 126 #endif // SHARK
127 #else // ZERO 127 #else // ZERO
128 #ifdef GRAALVM 128 #define VMTYPE COMPILER1_PRESENT("Client") \
129 #define VMTYPE "Graal" 129 COMPILER2_PRESENT("Server") \
130 #else // GRAALVM 130 COMPILERGRAAL_PRESENT("Graal")
131 #define VMTYPE COMPILER1_PRESENT("Client") \ 131 #endif // ZERO
132 COMPILER2_PRESENT("Server")
133 #endif // GRAALVM
134 #endif // ZERO
135 #endif // TIERED 132 #endif // TIERED
136 #endif 133 #endif
137 134
138 #ifndef HOTSPOT_VM_DISTRO 135 #ifndef HOTSPOT_VM_DISTRO
139 #error HOTSPOT_VM_DISTRO must be defined 136 #error HOTSPOT_VM_DISTRO must be defined