diff options
author | coleenp <none@none> | 2010-11-23 15:01:43 -0500 |
---|---|---|
committer | coleenp <none@none> | 2010-11-23 15:01:43 -0500 |
commit | 41c8986d5742a2d8018c5a5b5bc02a261863a313 (patch) | |
tree | b4141be94d3249385a93fe357d75c86c8d7b8516 | |
parent | 20636f303c8168e0cd6b986097ad69fd88bcf976 (diff) | |
parent | 01fa61bdf2a863e2c6d344830fafafd6304af669 (diff) |
Merge
-rw-r--r-- | src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 4 | ||||
-rw-r--r-- | src/share/vm/compiler/compileBroker.cpp | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp index fd78628b3..dfadb87e5 100644 --- a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp +++ b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp @@ -370,6 +370,10 @@ void os::print_context(outputStream* st, void* context) { ShouldNotCallThis(); } +void os::print_register_info(outputStream *st, void *context) { + ShouldNotCallThis(); +} + ///////////////////////////////////////////////////////////////////////////// // Stubs for things that would be in linux_zero.s if it existed. // You probably want to disassemble these monkeys to check they're ok. diff --git a/src/share/vm/compiler/compileBroker.cpp b/src/share/vm/compiler/compileBroker.cpp index 311d1b744..7d8a69f24 100644 --- a/src/share/vm/compiler/compileBroker.cpp +++ b/src/share/vm/compiler/compileBroker.cpp @@ -522,6 +522,7 @@ CompilerCounters::CompilerCounters(const char* thread_name, int instance, TRAPS) void CompileBroker::compilation_init() { _last_method_compiled[0] = '\0'; +#ifndef SHARK // Set the interface to the current compiler(s). int c1_count = CompilationPolicy::policy()->compiler_count(CompLevel_simple); int c2_count = CompilationPolicy::policy()->compiler_count(CompLevel_full_optimization); @@ -537,13 +538,12 @@ void CompileBroker::compilation_init() { } #endif // COMPILER2 -#ifdef SHARK -#if defined(COMPILER1) || defined(COMPILER2) -#error "Can't use COMPILER1 or COMPILER2 with shark" -#endif - _compilers[0] = new SharkCompiler(); - _compilers[1] = _compilers[0]; -#endif +#else // SHARK + int c1_count = 0; + int c2_count = 1; + + _compilers[1] = new SharkCompiler(); +#endif // SHARK // Initialize the CompileTask free list _task_free_list = NULL; |