Mercurial > hg > release > icedtea6-1.9
changeset 2053:6761bd85e3b7
Remove upstreamed Zero patches.
2010-04-09 Andrew John Hughes <ahughes@redhat.com>
* patches/zero/6903453.patch,
* patches/zero/6909153.patch,
* patches/zero/6913869.patch,
* patches/zero/6914622.patch,
* Makefile.am:
Remove patches applied upstream.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Sat, 10 Apr 2010 00:45:51 +0100 |
| parents | f36e028284a1 |
| children | c4d1a639219e |
| files | ChangeLog Makefile.am patches/zero/6903453.patch patches/zero/6909153.patch patches/zero/6913869.patch patches/zero/6914622.patch |
| diffstat | 6 files changed, 10 insertions(+), 195 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Apr 07 22:06:31 2010 +0100 +++ b/ChangeLog Sat Apr 10 00:45:51 2010 +0100 @@ -1,3 +1,12 @@ +2010-04-09 Andrew John Hughes <ahughes@redhat.com> + + * patches/zero/6903453.patch, + * patches/zero/6909153.patch, + * patches/zero/6913869.patch, + * patches/zero/6914622.patch, + * Makefile.am: + Remove patches applied upstream. + 2010-04-07 Andrew John Hughes <ahughes@redhat.com> * patches/openjdk/6879689-hotspot_warning_fix.patch,
--- a/Makefile.am Wed Apr 07 22:06:31 2010 +0100 +++ b/Makefile.am Sat Apr 10 00:45:51 2010 +0100 @@ -224,10 +224,6 @@ ICEDTEA_FSG_PATCHES = ICEDTEA_PATCHES = \ - patches/zero/6903453.patch \ - patches/zero/6909153.patch \ - patches/zero/6913869.patch \ - patches/zero/6914622.patch \ patches/zero/cppInterpreter-fast-bytecodes.patch \ patches/icedtea-notice-safepoints.patch \ patches/icedtea-parisc-opt.patch \ @@ -305,9 +301,7 @@ patches/extensions/netx-dist.patch \ patches/extensions/netx-umask.patch \ patches/icedtea-jtreg-httpTest.patch \ - patches/openjdk/6873059-javac-versioning-corba.patch \ - patches/hotspot/$(HSBUILD)/6873059-javac-versioning-hotspot.patch \ - patches/openjdk/6873059-javac-versioning-jdk.patch + patches/hotspot/$(HSBUILD)/6873059-javac-versioning-hotspot.patch if WITH_RHINO ICEDTEA_PATCHES += \
--- a/patches/zero/6903453.patch Wed Apr 07 22:06:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -diff -r 937144222e22 -r 28b983e5bb5f make/common/shared/Platform.gmk ---- openjdk/corba/make/common/shared/Platform.gmk Sun Nov 08 14:49:40 2009 -0800 -+++ openjdk/corba/make/common/shared/Platform.gmk Mon Nov 23 10:04:41 2009 +0000 -@@ -187,6 +187,9 @@ - sparc*) \ - echo sparc \ - ;; \ -+ arm*) \ -+ echo arm \ -+ ;; \ - *) \ - echo $(mach) \ - ;; \ -diff -r 8fb602395be0 -r ad1c88142958 make/common/shared/Platform.gmk ---- openjdk/jdk/make/common/shared/Platform.gmk Sun Nov 08 14:49:18 2009 -0800 -+++ openjdk/jdk/make/common/shared/Platform.gmk Mon Nov 23 10:04:47 2009 +0000 -@@ -165,6 +165,9 @@ - sparc*) \ - echo sparc \ - ;; \ -+ arm*) \ -+ echo arm \ -+ ;; \ - *) \ - echo $(mach) \ - ;; \ -diff -r 8fb602395be0 -r ad1c88142958 src/share/native/java/lang/fdlibm/include/fdlibm.h ---- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Sun Nov 08 14:49:18 2009 -0800 -+++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Mon Nov 23 10:04:47 2009 +0000 -@@ -29,7 +29,7 @@ - #ifdef __NEWVALID /* special setup for Sun test regime */ - #if defined(i386) || defined(i486) || \ - defined(intel) || defined(x86) || \ -- defined(i86pc) || defined(_M_IA64) -+ defined(i86pc) || defined(_M_IA64) || defined(ia64) - #define _LITTLE_ENDIAN - #endif - #endif
--- a/patches/zero/6909153.patch Wed Apr 07 22:06:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -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) {
--- a/patches/zero/6913869.patch Wed Apr 07 22:06:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -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
--- a/patches/zero/6914622.patch Wed Apr 07 22:06:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,98 +0,0 @@ -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") \ - \