/hg/icedtea6: 2010-01-05 Gary Benson <gbenson at redhat.com>

[gbenson at icedtea.classpath.org]

changeset c99b9280fdcf in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c99b9280fdcf
author: Gary Benson <gbenson at redhat.com>
date: Tue Jan 05 10:09:26 2010 +0000

	2010-01-05 Gary Benson <gbenson at redhat.com>

	 * patches/zero/6909153.patch: New file.
		* patches/zero/6913869.patch: Likewise.
		* Makefile.am (ICEDTEA_PATCHES): Added the above.


diffstat:

4 files changed, 60 insertions(+)
ChangeLog                  |    6 ++++++
Makefile.am                |    2 ++
patches/zero/6909153.patch |   40 ++++++++++++++++++++++++++++++++++++++++
patches/zero/6913869.patch |   12 ++++++++++++

diffs (85 lines):

diff -r 5e600a55ee80 -r c99b9280fdcf ChangeLog
--- a/ChangeLog	Thu Dec 24 14:00:06 2009 -0500
+++ b/ChangeLog	Tue Jan 05 10:09:26 2010 +0000
@@ -1,3 +1,9 @@ 2009-12-24  Deepak Bhole <dbhole at redhat.
+2010-01-05  Gary Benson  <gbenson at redhat.com>
+
+	* patches/zero/6909153.patch: New file.
+	* patches/zero/6913869.patch: Likewise.
+	* Makefile.am (ICEDTEA_PATCHES): Added the above.
+
 2009-12-24  Deepak Bhole <dbhole at redhat.com>
 
 	* Makefile.am: Define XP_UNIX, without which critical plugin API 
diff -r 5e600a55ee80 -r c99b9280fdcf Makefile.am
--- a/Makefile.am	Thu Dec 24 14:00:06 2009 -0500
+++ b/Makefile.am	Tue Jan 05 10:09:26 2010 +0000
@@ -199,6 +199,8 @@ ICEDTEA_PATCHES = \
 	patches/zero/6891677.patch \
 	patches/zero/6896043.patch \
 	patches/zero/6903453.patch \
+	patches/zero/6909153.patch \
+	patches/zero/6913869.patch \
 	patches/icedtea-notice-safepoints.patch \
 	patches/icedtea-parisc-opt.patch \
 	patches/icedtea-lucene-crash.patch \
diff -r 5e600a55ee80 -r c99b9280fdcf patches/zero/6909153.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/zero/6909153.patch	Tue Jan 05 10:09:26 2010 +0000
@@ -0,0 +1,40 @@
+diff -r 1ea456c6f2b7 -r 40e7c1d24e4a src/share/vm/compiler/compileBroker.cpp
+--- openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp	Tue Dec 22 17:56:03 2009 -0800
++++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp	Mon Jan 04 00:22:57 2010 -0800
+@@ -1820,9 +1820,11 @@
+                 CompileBroker::_t_standard_compilation.seconds(),
+                 CompileBroker::_t_standard_compilation.seconds() / CompileBroker::_total_standard_compile_count);
+   tty->print_cr("    On stack replacement   : %6.3f s, Average : %2.3f", CompileBroker::_t_osr_compilation.seconds(), CompileBroker::_t_osr_compilation.seconds() / CompileBroker::_total_osr_compile_count);
+-  compiler(CompLevel_fast_compile)->print_timers();
+-  if (compiler(CompLevel_fast_compile) != compiler(CompLevel_highest_tier)) {
+-    compiler(CompLevel_highest_tier)->print_timers();
++
++  if (compiler(CompLevel_fast_compile)) {
++    compiler(CompLevel_fast_compile)->print_timers();
++    if (compiler(CompLevel_fast_compile) != compiler(CompLevel_highest_tier))
++      compiler(CompLevel_highest_tier)->print_timers();
+   }
+ 
+   tty->cr();
+diff -r 1ea456c6f2b7 -r 40e7c1d24e4a src/share/vm/runtime/arguments.cpp
+--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp	Tue Dec 22 17:56:03 2009 -0800
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp	Mon Jan 04 00:22:57 2010 -0800
+@@ -2756,9 +2756,16 @@
+   set_aggressive_opts_flags();
+ 
+ #ifdef CC_INTERP
+-  // Biased locking is not implemented with c++ interpreter
++  // Clear flags not supported by the C++ interpreter
++  FLAG_SET_DEFAULT(ProfileInterpreter, false);
+   FLAG_SET_DEFAULT(UseBiasedLocking, false);
+-#endif /* CC_INTERP */
++  LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false));
++#endif // CC_INTERP
++
++#ifdef ZERO
++  // Clear flags not supported by Zero
++  FLAG_SET_DEFAULT(TaggedStackInterpreter, false);
++#endif // ZERO
+ 
+ #ifdef COMPILER2
+   if (!UseBiasedLocking || EmitSync != 0) {
diff -r 5e600a55ee80 -r c99b9280fdcf patches/zero/6913869.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/zero/6913869.patch	Tue Jan 05 10:09:26 2010 +0000
@@ -0,0 +1,12 @@
+diff -r 40e7c1d24e4a -r 896da934748c src/share/vm/prims/jni.cpp
+--- openjdk/hotspot/src/share/vm/prims/jni.cpp	Mon Jan 04 00:22:57 2010 -0800
++++ openjdk/hotspot/src/share/vm/prims/jni.cpp	Mon Jan 04 03:34:40 2010 -0800
+@@ -3241,7 +3241,7 @@
+     jint b = Atomic::xchg(0xdeadbeef, &a);
+     void *c = &a;
+     void *d = Atomic::xchg_ptr(&b, &c);
+-    assert(a == 0xdeadbeef && b == (jint) 0xcafebabe, "Atomic::xchg() works");
++    assert(a == (jint) 0xdeadbeef && b == (jint) 0xcafebabe, "Atomic::xchg() works");
+     assert(c == &b && d == &a, "Atomic::xchg_ptr() works");
+   }
+ #endif // ZERO && ASSERT