/hg/release/icedtea6-1.7: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Feb 26 06:16:18 PST 2010
changeset e7f06018d875 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=e7f06018d875
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.
changeset 398a7f03255b in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=398a7f03255b
author: Gary Benson <gbenson at redhat.com>
date: Mon Jan 11 11:43:43 2010 +0000
2010-01-11 Gary Benson <gbenson at redhat.com>
* patches/zero/6914622.patch: New file, imports changeset
for Sun bug 6914622 from jdk7/hotspot-comp.
* Makefile.am (ICEDTEA_PATCHES): Added the above.
* contrib/checkopts/checkopts: Updated for the above.
diffstat:
6 files changed, 170 insertions(+), 1 deletion(-)
ChangeLog | 13 +++++
Makefile.am | 3 +
contrib/checkopts/checkopts | 5 +-
patches/zero/6909153.patch | 40 +++++++++++++++++
patches/zero/6913869.patch | 12 +++++
patches/zero/6914622.patch | 98 +++++++++++++++++++++++++++++++++++++++++++
diffs (217 lines):
diff -r 151ff5eb1467 -r 398a7f03255b ChangeLog
--- a/ChangeLog Tue Feb 23 17:36:57 2010 +0000
+++ b/ChangeLog Mon Jan 11 11:43:43 2010 +0000
@@ -1,3 +1,16 @@ 2010-02-23 Gary Benson <gbenson at redhat
+2010-01-11 Gary Benson <gbenson at redhat.com>
+
+ * patches/zero/6914622.patch: New file, imports changeset
+ for Sun bug 6914622 from jdk7/hotspot-comp.
+ * Makefile.am (ICEDTEA_PATCHES): Added the above.
+ * contrib/checkopts/checkopts: Updated for the above.
+
+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.
+
2010-02-23 Gary Benson <gbenson at redhat.com>
* ports/hotspot/make/linux/makefiles/shark.make: Whitespace fixes.
diff -r 151ff5eb1467 -r 398a7f03255b Makefile.am
--- a/Makefile.am Tue Feb 23 17:36:57 2010 +0000
+++ b/Makefile.am Mon Jan 11 11:43:43 2010 +0000
@@ -204,6 +204,9 @@ ICEDTEA_PATCHES = \
patches/zero/6891677.patch \
patches/zero/6896043.patch \
patches/zero/6903453.patch \
+ patches/zero/6909153.patch \
+ patches/zero/6913869.patch \
+ patches/zero/6914622.patch \
patches/icedtea-notice-safepoints.patch \
patches/icedtea-parisc-opt.patch \
patches/icedtea-lucene-crash.patch \
diff -r 151ff5eb1467 -r 398a7f03255b contrib/checkopts/checkopts
--- a/contrib/checkopts/checkopts Tue Feb 23 17:36:57 2010 +0000
+++ b/contrib/checkopts/checkopts Mon Jan 11 11:43:43 2010 +0000
@@ -23,6 +23,7 @@ class Flag:
def test_values(self):
if self.type == "bool":
if self.name in (
+ "PrintFlagsInitial", # already done :)
"ExtendedDTraceProbes", # Solaris only
"RequireSharedSpaces", # Not set up
"PauseAtStartup"): # Just don't...
@@ -62,7 +63,9 @@ class Main:
def read_flags(self):
out, err = subprocess.Popen(
- [self.java, "-XX:+UnlockDiagnosticVMOptions", "-Xprintflags"],
+ [self.java,
+ "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:+PrintFlagsInitial"],
stdout = subprocess.PIPE,
stderr = subprocess.PIPE).communicate()
if err:
diff -r 151ff5eb1467 -r 398a7f03255b patches/zero/6909153.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/zero/6909153.patch Mon Jan 11 11:43:43 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 151ff5eb1467 -r 398a7f03255b patches/zero/6913869.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/zero/6913869.patch Mon Jan 11 11:43:43 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
diff -r 151ff5eb1467 -r 398a7f03255b patches/zero/6914622.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/zero/6914622.patch Mon Jan 11 11:43:43 2010 +0000
@@ -0,0 +1,98 @@
+diff -r 9b9c1ee9b3f6 -r f62a22282a47 src/share/vm/runtime/arguments.cpp
+--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp Wed Jan 06 22:21:39 2010 -0800
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp Thu Jan 07 16:24:17 2010 -0800
+@@ -2633,6 +2633,10 @@
+ if (match_option(option, "-XX:-IgnoreUnrecognizedVMOptions", &tail)) {
+ IgnoreUnrecognizedVMOptions = false;
+ }
++ if (match_option(option, "-XX:+PrintFlagsInitial", &tail)) {
++ CommandLineFlags::printFlags();
++ vm_exit(0);
++ }
+ }
+
+ if (IgnoreUnrecognizedVMOptions) {
+@@ -2795,11 +2799,9 @@
+ CommandLineFlags::printSetFlags();
+ }
+
+-#ifdef ASSERT
+ if (PrintFlagsFinal) {
+ CommandLineFlags::printFlags();
+ }
+-#endif
+
+ return JNI_OK;
+ }
+diff -r 9b9c1ee9b3f6 -r f62a22282a47 src/share/vm/runtime/globals.cpp
+--- openjdk/hotspot/src/share/vm/runtime/globals.cpp Wed Jan 06 22:21:39 2010 -0800
++++ openjdk/hotspot/src/share/vm/runtime/globals.cpp Thu Jan 07 16:24:17 2010 -0800
+@@ -468,6 +468,8 @@
+ assert(Arguments::check_vm_args_consistency(), "Some flag settings conflict");
+ }
+
++#endif // PRODUCT
++
+ void CommandLineFlags::printFlags() {
+ // Print the flags sorted by name
+ // note: this method is called before the thread structure is in place
+@@ -493,5 +495,3 @@
+ }
+ FREE_C_HEAP_ARRAY(Flag*, array);
+ }
+-
+-#endif
+diff -r 9b9c1ee9b3f6 -r f62a22282a47 src/share/vm/runtime/globals.hpp
+--- openjdk/hotspot/src/share/vm/runtime/globals.hpp Wed Jan 06 22:21:39 2010 -0800
++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp Thu Jan 07 16:24:17 2010 -0800
+@@ -211,7 +211,7 @@
+ static bool wasSetOnCmdline(const char* name, bool* value);
+ static void printSetFlags();
+
+- static void printFlags() PRODUCT_RETURN;
++ static void printFlags();
+
+ static void verify() PRODUCT_RETURN;
+ };
+@@ -327,9 +327,6 @@
+ product(bool, UseMembar, false, \
+ "(Unstable) Issues membars on thread state transitions") \
+ \
+- product(bool, PrintCommandLineFlags, false, \
+- "Prints flags that appeared on the command line") \
+- \
+ diagnostic(bool, UnlockDiagnosticVMOptions, trueInDebug, \
+ "Enable normal processing of flags relating to field diagnostics")\
+ \
+@@ -1967,9 +1964,6 @@
+ "number of times a GC thread (minus the coordinator) " \
+ "will sleep while yielding before giving up and resuming GC") \
+ \
+- notproduct(bool, PrintFlagsFinal, false, \
+- "Print all command line flags after argument processing") \
+- \
+ /* gc tracing */ \
+ manageable(bool, PrintGC, false, \
+ "Print message at garbage collect") \
+@@ -2269,11 +2263,20 @@
+ "If false, restricts profiled locations to the root method only") \
+ \
+ product(bool, PrintVMOptions, trueInDebug, \
+- "print VM flag settings") \
++ "Print flags that appeared on the command line") \
+ \
+ product(bool, IgnoreUnrecognizedVMOptions, false, \
+ "Ignore unrecognized VM options") \
+ \
++ product(bool, PrintCommandLineFlags, false, \
++ "Print flags specified on command line or set by ergonomics") \
++ \
++ product(bool, PrintFlagsInitial, false, \
++ "Print all VM flags before argument processing and exit VM") \
++ \
++ product(bool, PrintFlagsFinal, false, \
++ "Print all VM flags after argument and ergonomic processing") \
++ \
+ diagnostic(bool, SerializeVMOutput, true, \
+ "Use a mutex to serialize output to tty and hotspot.log") \
+ \
More information about the distro-pkg-dev
mailing list