1.1 --- a/src/share/vm/compiler/compileBroker.cpp Fri Nov 19 17:01:34 2010 -0800
1.2 +++ b/src/share/vm/compiler/compileBroker.cpp Tue Nov 23 04:33:42 2010 -0800
1.3 @@ -522,6 +522,7 @@
1.4 void CompileBroker::compilation_init() {
1.5 _last_method_compiled[0] = '\0';
1.6
1.7 +#ifndef SHARK
1.8 // Set the interface to the current compiler(s).
1.9 int c1_count = CompilationPolicy::policy()->compiler_count(CompLevel_simple);
1.10 int c2_count = CompilationPolicy::policy()->compiler_count(CompLevel_full_optimization);
1.11 @@ -537,13 +538,12 @@
1.12 }
1.13 #endif // COMPILER2
1.14
1.15 -#ifdef SHARK
1.16 -#if defined(COMPILER1) || defined(COMPILER2)
1.17 -#error "Can't use COMPILER1 or COMPILER2 with shark"
1.18 -#endif
1.19 - _compilers[0] = new SharkCompiler();
1.20 - _compilers[1] = _compilers[0];
1.21 -#endif
1.22 +#else // SHARK
1.23 + int c1_count = 0;
1.24 + int c2_count = 1;
1.25 +
1.26 + _compilers[1] = new SharkCompiler();
1.27 +#endif // SHARK
1.28
1.29 // Initialize the CompileTask free list
1.30 _task_free_list = NULL;
