Mercurial > hg > release > icedtea6-1.4.1
changeset 1304:8ed37e6cc2df
2009-01-09 Gary Benson <gbenson@redhat.com>
* patches/icedtea-cc-interp-jvmti.patch: Also disable pop_frame.
author | Gary Benson <gbenson@redhat.com> |
---|---|
date | Fri, 09 Jan 2009 07:19:20 -0500 |
parents | 6c79e6c68d05 |
children | 972ccbe95125 |
files | ChangeLog patches/icedtea-cc-interp-jvmti.patch |
diffstat | 2 files changed, 11 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jan 08 23:25:38 2009 +0100 +++ b/ChangeLog Fri Jan 09 07:19:20 2009 -0500 @@ -1,3 +1,7 @@ +2009-01-09 Gary Benson <gbenson@redhat.com> + + * patches/icedtea-cc-interp-jvmti.patch: Also disable pop_frame. + 2009-01-08 Matthias Klose <doko@ubuntu.com> PR icedtea/277
--- a/patches/icedtea-cc-interp-jvmti.patch Thu Jan 08 23:25:38 2009 +0100 +++ b/patches/icedtea-cc-interp-jvmti.patch Fri Jan 09 07:19:20 2009 -0500 @@ -1,26 +1,23 @@ --- 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 @@ +@@ -84,7 +84,9 @@ memset(&jc, 0, sizeof(jc)); jc.can_get_bytecodes = 1; -+#ifdef CC_INTERP -+ jc.can_signal_thread = 0; -+#else ++#ifndef CC_INTERP jc.can_signal_thread = 1; -+#endif // CC_INTERP ++#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 @@ +@@ -115,8 +117,10 @@ + jvmtiCapabilities jc; memset(&jc, 0, sizeof(jc)); ++#ifndef CC_INTERP jc.can_pop_frame = 1; -+#ifdef CC_INTERP -+ jc.can_force_early_return = 0; -+#else jc.can_force_early_return = 1; -+#endif // CC_INTERP ++#endif // !CC_INTERP jc.can_get_source_debug_extension = 1; jc.can_access_local_variables = 1; jc.can_maintain_original_method_order = 1;