Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Fri Nov 19 17:01:34 2010 -0800
     1.2 +++ b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Tue Nov 23 04:33:42 2010 -0800
     1.3 @@ -370,6 +370,10 @@
     1.4    ShouldNotCallThis();
     1.5  }
     1.6  
     1.7 +void os::print_register_info(outputStream *st, void *context) {
     1.8 +  ShouldNotCallThis();
     1.9 +}
    1.10 +
    1.11  /////////////////////////////////////////////////////////////////////////////
    1.12  // Stubs for things that would be in linux_zero.s if it existed.
    1.13  // You probably want to disassemble these monkeys to check they're ok.

     2.1 --- a/src/share/vm/compiler/compileBroker.cpp	Fri Nov 19 17:01:34 2010 -0800
     2.2 +++ b/src/share/vm/compiler/compileBroker.cpp	Tue Nov 23 04:33:42 2010 -0800
     2.3 @@ -522,6 +522,7 @@
     2.4  void CompileBroker::compilation_init() {
     2.5    _last_method_compiled[0] = '\0';
     2.6  
     2.7 +#ifndef SHARK
     2.8    // Set the interface to the current compiler(s).
     2.9    int c1_count = CompilationPolicy::policy()->compiler_count(CompLevel_simple);
    2.10    int c2_count = CompilationPolicy::policy()->compiler_count(CompLevel_full_optimization);
    2.11 @@ -537,13 +538,12 @@
    2.12    }
    2.13  #endif // COMPILER2
    2.14  
    2.15 -#ifdef SHARK
    2.16 -#if defined(COMPILER1) || defined(COMPILER2)
    2.17 -#error "Can't use COMPILER1 or COMPILER2 with shark"
    2.18 -#endif
    2.19 -  _compilers[0] = new SharkCompiler();
    2.20 -  _compilers[1] = _compilers[0];
    2.21 -#endif
    2.22 +#else // SHARK
    2.23 +  int c1_count = 0;
    2.24 +  int c2_count = 1;
    2.25 +
    2.26 +  _compilers[1] = new SharkCompiler();
    2.27 +#endif // SHARK
    2.28  
    2.29    // Initialize the CompileTask free list
    2.30    _task_free_list = NULL;