Mercurial > hg > truffle

comparison src/share/vm/runtime/globals.hpp @ 20807:8d4496e10a51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix merge
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Wed, 08 Apr 2015 11:07:01 +0200
parents 7848fc12602b
children be896a1983c0
comparison
equal deleted inserted replaced
20806:6ee9b878902b 20807:8d4496e10a51
208 define_pd_global(bool, NeverActAsServerClassMachine, true); 208 define_pd_global(bool, NeverActAsServerClassMachine, true);
209 define_pd_global(uint64_t,MaxRAM, 1ULL*G); 209 define_pd_global(uint64_t,MaxRAM, 1ULL*G);
210 #define CI_COMPILER_COUNT 0 210 #define CI_COMPILER_COUNT 0
211 #else 211 #else
212 212
213 #ifdef COMPILER2 213 #if defined(COMPILER2) || defined(COMPILERGRAAL)
214 #define CI_COMPILER_COUNT 2 214 #define CI_COMPILER_COUNT 2
215 #else 215 #else
216 #define CI_COMPILER_COUNT 1 216 #define CI_COMPILER_COUNT 1
217 #endif // COMPILER2 217 #endif // COMPILER2
218 218