--- a/ChangeLog	Tue Dec 23 11:06:37 2008 +0100
+++ b/ChangeLog	Wed Dec 24 08:25:40 2008 -0500
@@ -1,3 +1,10 @@
+2008-12-24  Gary Benson  <gbenson@redhat.com>
+
+	* patches/icedtea-cc-interp-jvmti.patch: New file.
+	* patches/icedtea-cc-interp-no-fer.patch: Deleted file.
+	* Makefile.am (ICEDTEA_PATCHES): Apply the above.
+	* HACKING: Document the above.
+
 2008-12-23  Matthias Klose  <doko@ubuntu.com>
 
 	* patches/hotspot/original/icedtea-version.patch: Update.

--- a/HACKING	Tue Dec 23 11:06:37 2008 +0100
+++ b/HACKING	Wed Dec 24 08:25:40 2008 -0500
@@ -68,7 +68,6 @@
 * icedtea-alsa-default-device.patch: Fix problems with using the ALSA 'default' device.
 * icedtea-linker-libs-order.patch: When linking, put the referenced libraries after the object files (PR237).
 * icedtea-f2i-overflow.patch: Replaces the code used by [fd]2[il] bytecodes to correctly handle overflows. (PR244, S6779290)
-* icedtea-cc-interp-no-fer.patch: Report that we cannot force early returns with the C++ interpreter.
 * icedtea-6761856-freetypescaler.patch: Fix IcedTea bug #227, OpenJDK bug
   #6761856, swing TextLayout.getBounds() returns shifted bounds.
 * icedtea-display-mode-changer.patch: Add extra test class.
@@ -77,7 +76,8 @@
 * icedtea-6728542-epoll.patch: Make EPoll work on non-x86 platforms. (PR265)
 * icedtea-fortify-source.patch: Fix build failures with -D_FORTIFY_SOURCE=2.
 * icedtea-format-warnings.patch: Fix build failures with -Wformat=1.
-* patches/icedtea-io_util-overflow.patch: Replace some code to correctly handle overflows. (S6788196)
+* icedtea-io_util-overflow.patch: Replace some code to correctly handle overflows. (S6788196)
+* icedtea-cc-interp-jvmti.patch: Disable some JVMTI capabilities which are unsupported or do not work with the C++ interpreter.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
@@ -155,3 +155,4 @@
 * icedtea-xinerama.patch: Fix crash talking to second X screen (S6604044): Included upstream in OpenJDK6 b10 and OpenJDK7 b28.
 * icedtea-xslfix.patch: Fix malformed bytecodeInterpreterWithChecks XSL file (S6707485): Included upstream in OpenJDK7 b29/hs13.
 * openjdk-color.patch: Include Free java.awt.color and java.awt.image (S6662775): Included upstream in OpenJDK6 b06 and OpenJDK7 b28.
+* icedtea-cc-interp-no-fer.patch: Replaced with icedtea-cc-interp-jvmti.patch, of which it is a subset.

--- a/Makefile.am	Tue Dec 23 11:06:37 2008 +0100
+++ b/Makefile.am	Wed Dec 24 08:25:40 2008 -0500
@@ -637,13 +637,13 @@
 	patches/icedtea-alsa-default-device.patch \
 	patches/icedtea-linker-libs-order.patch \
 	patches/icedtea-f2i-overflow.patch \
-	patches/icedtea-cc-interp-no-fer.patch \
 	patches/icedtea-6761856-freetypescaler.patch \
 	patches/icedtea-display-mode-changer.patch \
 	patches/icedtea-testenv.patch \
 	patches/icedtea-samejvm-safe.patch \
 	patches/icedtea-6728542-epoll.patch \
-	patches/icedtea-io_util-overflow.patch
+	patches/icedtea-io_util-overflow.patch \
+	patches/icedtea-cc-interp-jvmti.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-cc-interp-jvmti.patch	Wed Dec 24 08:25:40 2008 -0500
@@ -0,0 +1,26 @@
+--- openjdk/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp	2008-12-24 12:01:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp	2008-12-24 12:00:29.000000000 +0000
+@@ -84,7 +84,11 @@
+ 
+   memset(&jc, 0, sizeof(jc));
+   jc.can_get_bytecodes = 1;
++#ifdef CC_INTERP
++  jc.can_signal_thread = 0;
++#else
+   jc.can_signal_thread = 1;
++#endif // CC_INTERP
+   jc.can_get_source_file_name = 1;
+   jc.can_get_line_numbers = 1;
+   jc.can_get_synthetic_attribute = 1;
+@@ -116,7 +120,11 @@
+ 
+   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;

--- a/patches/icedtea-cc-interp-no-fer.patch	Tue Dec 23 11:06:37 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-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;