--- a/ChangeLog	Fri Feb 20 11:39:27 2009 -0500
+++ b/ChangeLog	Mon Feb 23 10:33:28 2009 +0000
@@ -18,6 +18,21 @@
 	* patches/hotspot/original/icedtea-includedb.patch,
 	* patches/icedtea-libraries.patch: Recreated.
 
+2009-02-23  Gary Benson  <gbenson@redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+	(CppInterpreter::deopt_entry): Remove Shark conditional.
+	* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
+	(frame::patch_pc): Likewise.
+	* ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp
+	(Deoptimization::unwind_callee_save_values): Likewise.
+	* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp
+	(NativeJump::check_verified_entry_alignment): Likewise.
+	* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp
+	(NativeJump::patch_verified_entry): Likewise.
+	* ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
+	(Deoptimization::last_frame_adjust): Likewise.
+	
 2009-02-20  Gary Benson  <gbenson@redhat.com>
 
 	* patches/icedtea-zero-build.patch: Make Zero builds say "Zero"

--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Fri Feb 20 11:39:27 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Mon Feb 23 10:33:28 2009 +0000
@@ -902,11 +902,7 @@
 
 address CppInterpreter::deopt_entry(TosState state, int length)
 {
-#ifdef SHARK
   return NULL;
-#else
-  Unimplemented();
-#endif // SHARK
 }
 
 // Helper for (runtime) stack overflow checks

--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp	Fri Feb 20 11:39:27 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp	Mon Feb 23 10:33:28 2009 +0000
@@ -106,14 +106,10 @@
 
 void frame::patch_pc(Thread* thread, address pc)
 {
-#ifdef SHARK
   // We borrow this call to set the thread pointer in the interpreter
   // state; the hook to set up deoptimized frames isn't supplied it.
   assert(pc == NULL, "should be");
   get_interpreterState()->set_thread((JavaThread *) thread);
-#else
-  Unimplemented();
-#endif // SHARK
 }
 
 bool frame::safe_for_sender(JavaThread *thread)

--- a/ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp	Fri Feb 20 11:39:27 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp	Mon Feb 23 10:33:28 2009 +0000
@@ -68,7 +68,4 @@
 void Deoptimization::unwind_callee_save_values(frame* f,
                                                vframeArray* vframe_array)
 {
-#ifndef SHARK
-  Unimplemented();
-#endif // !SHARK
 }

--- a/ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp	Fri Feb 20 11:39:27 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp	Mon Feb 23 10:33:28 2009 +0000
@@ -40,7 +40,6 @@
                                       address verified_entry,
                                       address dest)
 {
-#ifdef SHARK
   assert(dest == SharedRuntime::get_handle_wrong_method_stub(), "should be");
 
 #ifdef CC_INTERP
@@ -48,7 +47,4 @@
 #else
   Unimplemented();
 #endif // CC_INTERP  
-#else
-  Unimplemented();
-#endif // SHARK
 }

--- a/ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp	Fri Feb 20 11:39:27 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp	Mon Feb 23 10:33:28 2009 +0000
@@ -181,10 +181,8 @@
   }
 
   static void check_verified_entry_alignment(address entry,
-                                             address verified_entry) {
-#ifndef SHARK
-    Unimplemented();
-#endif // !SHARK
+                                             address verified_entry) 
+  {
   }
 
   static void patch_verified_entry(address entry,

--- a/ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp	Fri Feb 20 11:39:27 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp	Mon Feb 23 10:33:28 2009 +0000
@@ -69,11 +69,7 @@
 
 int Deoptimization::last_frame_adjust(int callee_parameters, int callee_locals)
 {
-#ifdef SHARK
   return 0;
-#else
-  Unimplemented();
-#endif // SHARK
 }
 
 uint SharedRuntime::out_preserve_stack_slots()