/hg/release/icedtea6-1.12: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Nov 15 23:14:01 PST 2013
changeset eedd8076f56b in /hg/release/icedtea6-1.12
details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=eedd8076f56b
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Nov 15 20:57:36 2013 +0000
Add backport for HotSpot suggested by Xerxes.
2013-03-26 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new backport.
* patches/openjdk/6840152-jvm_crashes_with_heavyweight_monitors.patch:
Backport suggested by Xerxes for hs20.
changeset 09d85ab75305 in /hg/release/icedtea6-1.12
details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=09d85ab75305
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Sat Nov 16 07:13:34 2013 +0000
S7022999: Can't build with FORCE_TIERED=0.
2013-04-26 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new backport.
* NEWS: Updated.
* patches/hotspot/original/7022999-fastlocking_compiler1_only.patch:
Backport fix to make Zero build work following
6840152.
diffstat:
ChangeLog | 16 +++++
Makefile.am | 4 +-
NEWS | 4 +
patches/openjdk/6840152-jvm_crashes_with_heavyweight_monitors.patch | 32 ++++++++++
patches/openjdk/7022999-fastlocking_compiler1_only.patch | 25 +++++++
5 files changed, 80 insertions(+), 1 deletions(-)
diffs (116 lines):
diff -r e319de2968f3 -r 09d85ab75305 ChangeLog
--- a/ChangeLog Thu Aug 29 17:42:01 2013 +0100
+++ b/ChangeLog Sat Nov 16 07:13:34 2013 +0000
@@ -1,3 +1,19 @@
+2013-04-26 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new backport.
+ * NEWS: Updated.
+ * patches/hotspot/original/7022999-fastlocking_compiler1_only.patch:
+ Backport fix to make Zero build work following
+ 6840152.
+
+2013-03-26 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new backport.
+ * patches/openjdk/6840152-jvm_crashes_with_heavyweight_monitors.patch:
+ Backport suggested by Xerxes for hs20.
+
2013-08-29 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
diff -r e319de2968f3 -r 09d85ab75305 Makefile.am
--- a/Makefile.am Thu Aug 29 17:42:01 2013 +0100
+++ b/Makefile.am Sat Nov 16 07:13:34 2013 +0000
@@ -710,7 +710,9 @@
patches/openjdk/6636370-appcontext_simplification.patch \
patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch \
patches/openjdk/8014469-tzdata2013c.patch \
- patches/openjdk/8020054-tzdata2013d.patch
+ patches/openjdk/8020054-tzdata2013d.patch \
+ patches/openjdk/6840152-jvm_crashes_with_heavyweight_monitors.patch \
+ patches/openjdk/7022999-fastlocking_compiler1_only.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r e319de2968f3 -r 09d85ab75305 NEWS
--- a/NEWS Thu Aug 29 17:42:01 2013 +0100
+++ b/NEWS Sat Nov 16 07:13:34 2013 +0000
@@ -13,6 +13,10 @@
New in release 1.12.7 (2013-XX-XX):
+* Backports
+ - S6840152: JVM crashes when heavyweight monitors are used
+ - S7022999: Can't build with FORCE_TIERED=0
+
New in release 1.12.6 (2013-07-10):
* Security fixes
diff -r e319de2968f3 -r 09d85ab75305 patches/openjdk/6840152-jvm_crashes_with_heavyweight_monitors.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6840152-jvm_crashes_with_heavyweight_monitors.patch Sat Nov 16 07:13:34 2013 +0000
@@ -0,0 +1,32 @@
+# HG changeset patch
+# User coleenp
+# Date 1297874084 18000
+# Node ID c08677f982895c7e89d370768ec261c00b0d6e2d
+# Parent 5415131bc5ab69d30d14636e414d1fa400800408
+6840152: JVM crashes when heavyweight monitors are used
+Summary: Turn off biased locking if !UseFastLocking or UseHeavyMonitors options are requested.
+Reviewed-by: phh, never, dcubed, dholmes
+
+diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp
+--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+@@ -3103,6 +3103,19 @@
+ // Set flags if Aggressive optimization flags (-XX:+AggressiveOpts) enabled.
+ set_aggressive_opts_flags();
+
++ // Turn off biased locking for locking debug mode flags,
++ // which are subtlely different from each other but neither works with
++ // biased locking.
++ if (!UseFastLocking || UseHeavyMonitors) {
++ if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) {
++ // flag set to true on command line; warn the user that they
++ // can't enable biased locking here
++ warning("Biased Locking is not supported with locking debug flags"
++ "; ignoring UseBiasedLocking flag." );
++ }
++ UseBiasedLocking = false;
++ }
++
+ #ifdef CC_INTERP
+ // Clear flags not supported by the C++ interpreter
+ FLAG_SET_DEFAULT(ProfileInterpreter, false);
diff -r e319de2968f3 -r 09d85ab75305 patches/openjdk/7022999-fastlocking_compiler1_only.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7022999-fastlocking_compiler1_only.patch Sat Nov 16 07:13:34 2013 +0000
@@ -0,0 +1,25 @@
+# HG changeset patch
+# User coleenp
+# Date 1299199896 18000
+# Node ID 9f44e9aad2d9528c6a7c59f29be7974685d6b629
+# Parent a3c0ec0428a2564a70a33a0348553e9d4c994c63
+7022999: Can't build with FORCE_TIERED=0
+Summary: Put UseFastLocking test under #ifdef COMPILER1
+Reviewed-by: kvn, phh, never, dcubed
+
+diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp
+--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+@@ -3114,7 +3114,11 @@
+ // Turn off biased locking for locking debug mode flags,
+ // which are subtlely different from each other but neither works with
+ // biased locking.
+- if (!UseFastLocking || UseHeavyMonitors) {
++ if (UseHeavyMonitors
++#ifdef COMPILER1
++ || !UseFastLocking
++#endif // COMPILER1
++ ) {
+ if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) {
+ // flag set to true on command line; warn the user that they
+ // can't enable biased locking here
More information about the distro-pkg-dev
mailing list