Mercurial > hg > release > icedtea6-1.12
changeset 3022:09d85ab75305
S7022999: Can't build with FORCE_TIERED=0.
2013-04-26 Andrew John Hughes <gnu.andrew@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.
author | Andrew John Hughes <gnu.andrew@redhat.com> |
---|---|
date | Sat, 16 Nov 2013 07:13:34 +0000 |
parents | eedd8076f56b |
children | 0ac001e24883 |
files | ChangeLog Makefile.am NEWS patches/openjdk/7022999-fastlocking_compiler1_only.patch |
diffstat | 4 files changed, 40 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Nov 15 20:57:36 2013 +0000 +++ b/ChangeLog Sat Nov 16 07:13:34 2013 +0000 @@ -1,3 +1,12 @@ +2013-04-26 Andrew John Hughes <gnu.andrew@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@redhat.com> * Makefile.am:
--- a/Makefile.am Fri Nov 15 20:57:36 2013 +0000 +++ b/Makefile.am Sat Nov 16 07:13:34 2013 +0000 @@ -711,7 +711,8 @@ patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch \ patches/openjdk/8014469-tzdata2013c.patch \ patches/openjdk/8020054-tzdata2013d.patch \ - patches/openjdk/6840152-jvm_crashes_with_heavyweight_monitors.patch + patches/openjdk/6840152-jvm_crashes_with_heavyweight_monitors.patch \ + patches/openjdk/7022999-fastlocking_compiler1_only.patch if WITH_RHINO ICEDTEA_PATCHES += \
--- a/NEWS Fri Nov 15 20:57:36 2013 +0000 +++ 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
--- /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