--- a/ChangeLog	Fri Nov 07 05:51:11 2008 -0500
+++ b/ChangeLog	Fri Nov 07 06:50:49 2008 -0500
@@ -1,3 +1,9 @@
+2008-11-07  Gary Benson  <gbenson@redhat.com>
+
+	* patches/icedtea-cc-interp-no-fer.patch: New file.
+	* Makefile.am (ICEDTEA_PATCHES): Apply the above.
+	* HACKING: Document the above.
+
 2008-11-07  Gary Benson  <gbenson@redhat.com>
 
 	* ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp

--- a/HACKING	Fri Nov 07 05:51:11 2008 -0500
+++ b/HACKING	Fri Nov 07 06:50:49 2008 -0500
@@ -64,6 +64,7 @@
 * icedtea-hotspot7-tests.patch: Adds hotspot compiler tests from jdk7 tree.
 * icedtea-renderer-crossing.patch: Check whether crossing is initialized in Pisces Renderer.
 * icedtea-f2i-overflow.patch: Replaces the code used by [fd]2[il] bytecodes to correctly handle overflows. (PR244)
+* icedtea-cc-interp-no-fer.patch: Report that we cannot force early returns with the C++ interpreter.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 

--- a/Makefile.am	Fri Nov 07 05:51:11 2008 -0500
+++ b/Makefile.am	Fri Nov 07 06:50:49 2008 -0500
@@ -535,7 +535,8 @@
 	patches/icedtea-renderer-crossing.patch \
 	patches/icedtea-alsa-default-device.patch \
 	patches/icedtea-linker-libs-order.patch \
-	patches/icedtea-f2i-overflow.patch
+	patches/icedtea-f2i-overflow.patch \
+	patches/icedtea-cc-interp-no-fer.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-cc-interp-no-fer.patch	Fri Nov 07 06:50:49 2008 -0500
@@ -0,0 +1,15 @@
+diff -r 11b9bdd4bbd3 openjdk/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp
+--- openjdk/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp	Fri Nov 07 10:53:57 2008 +0000
++++ openjdk/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp	Fri Nov 07 11:29:34 2008 +0000
+@@ -116,7 +116,11 @@ jvmtiCapabilities JvmtiManageCapabilitie
+   
+   memset(&jc, 0, sizeof(jc));
+   jc.can_pop_frame = 1;
++#ifdef CC_INTERP
++  jc.can_force_early_return = 0;
++#else
+   jc.can_force_early_return = 1;
++#endif // CC_INTERP
+   jc.can_get_source_debug_extension = 1;
+   jc.can_access_local_variables = 1;
+   jc.can_maintain_original_method_order = 1;