Mercurial > hg > truffle
comparison src/share/vm/compiler/compileBroker.cpp @ 18125:2a69cbe850a8
Reduce diff with upstream
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Mon, 20 Oct 2014 19:07:20 +0200 |
parents | 52b4284cb496 |
children | 9bb816169777 |
comparison
equal
deleted
inserted
replaced
18124:689092d5cf44 | 18125:2a69cbe850a8 |
---|---|
822 #ifdef COMPILER2 | 822 #ifdef COMPILER2 |
823 if (c2_count > 0) { | 823 if (c2_count > 0) { |
824 _compilers[1] = new C2Compiler(); | 824 _compilers[1] = new C2Compiler(); |
825 } | 825 } |
826 #endif // COMPILER2 | 826 #endif // COMPILER2 |
827 | |
827 #else // SHARK | 828 #else // SHARK |
828 int c1_count = 0; | 829 int c1_count = 0; |
829 int c2_count = 1; | 830 int c2_count = 1; |
830 | 831 |
831 _compilers[1] = new SharkCompiler(); | 832 _compilers[1] = new SharkCompiler(); |