# HG changeset patch
# User coleenp
# Date 1290542503 18000
# Node ID e33f46fc48edcb2c95048846f28ab1f6f7228891
# Parent  a6b067997c7ee2db75f04a9f5e1b5476d7eefe64# Parent  b675ff1ca7a384a7bd234086ab71e75ee7b9afce
Merge

diff -r a6b067997c7e -r e33f46fc48ed src/os_cpu/linux_zero/vm/os_linux_zero.cpp
--- a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Fri Nov 19 23:46:06 2010 -0500
+++ b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Tue Nov 23 15:01:43 2010 -0500
@@ -370,6 +370,10 @@
   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 -r a6b067997c7e -r e33f46fc48ed src/share/vm/compiler/compileBroker.cpp
--- a/src/share/vm/compiler/compileBroker.cpp	Fri Nov 19 23:46:06 2010 -0500
+++ b/src/share/vm/compiler/compileBroker.cpp	Tue Nov 23 15:01:43 2010 -0500
@@ -522,6 +522,7 @@
 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 @@
   }
 #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;