diff options
| author | Ivan Dubrov <idubrov@guidewire.com> | 2015-03-31 18:14:18 -0700 |
|---|---|---|
| committer | Ivan Dubrov <idubrov@guidewire.com> | 2015-03-31 18:16:53 -0700 |
| commit | 53c3f53814ae54b4450fc68f01f1972631eaf9e8 (patch) | |
| tree | 4474eab37dec71cbdc2b368ee48d0376c7b9ab2a /hotspot/.hg/patches/arguments-java8u31.patch | |
| parent | b620f801f5a0382da772f73af23da315667357a4 (diff) | |
| download | dcevm-53c3f53814ae54b4450fc68f01f1972631eaf9e8.tar.gz dcevm-53c3f53814ae54b4450fc68f01f1972631eaf9e8.zip | |
jdk8u40-b25 updates
Diffstat (limited to 'hotspot/.hg/patches/arguments-java8u31.patch')
| -rw-r--r-- | hotspot/.hg/patches/arguments-java8u31.patch | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/hotspot/.hg/patches/arguments-java8u31.patch b/hotspot/.hg/patches/arguments-java8u31.patch index b7e892bb..872e5109 100644 --- a/hotspot/.hg/patches/arguments-java8u31.patch +++ b/hotspot/.hg/patches/arguments-java8u31.patch @@ -1,8 +1,10 @@ -diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp -index 1565f88..5982b58 100644 ---- a/src/share/vm/runtime/arguments.cpp -+++ b/src/share/vm/runtime/arguments.cpp -@@ -62,8 +62,8 @@ +# HG changeset patch +# Parent 94dee6e9176e68ea1122af0dc98b6a5c152ea1e5 + +diff -r 94dee6e9176e src/share/vm/runtime/arguments.cpp +--- a/src/share/vm/runtime/arguments.cpp Tue Mar 31 17:58:49 2015 -0700 ++++ b/src/share/vm/runtime/arguments.cpp Tue Mar 31 18:01:20 2015 -0700 +@@ -65,8 +65,8 @@ #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" #endif // INCLUDE_ALL_GCS @@ -13,18 +15,18 @@ index 1565f88..5982b58 100644 #define DEFAULT_JAVA_LAUNCHER "generic" // Disable options not supported in this release, with a warning if they -@@ -1511,6 +1511,10 @@ - - void Arguments::set_ergonomics_flags() { +@@ -1561,6 +1561,10 @@ + } + void Arguments::select_gc_ergonomically() { + if (AllowEnhancedClassRedefinition) { + // (DCEVM) enforces serial GC + FLAG_SET_ERGO(bool, UseSerialGC, true); + } if (os::is_server_class_machine()) { - // If no other collector is requested explicitly, - // let the VM select the collector based on -@@ -1988,6 +1992,17 @@ + if (should_auto_select_low_pause_collector()) { + FLAG_SET_ERGO(bool, UseConcMarkSweepGC, true); +@@ -2082,6 +2086,17 @@ if (UseConcMarkSweepGC || UseParNewGC) i++; if (UseParallelGC || UseParallelOldGC) i++; if (UseG1GC) i++; @@ -42,11 +44,10 @@ index 1565f88..5982b58 100644 if (i > 1) { jio_fprintf(defaultStream::error_stream(), "Conflicting collector combinations in option list; " -diff --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp -index 63222af..7597eda 100644 ---- a/src/share/vm/runtime/globals.hpp -+++ b/src/share/vm/runtime/globals.hpp -@@ -1283,6 +1283,9 @@ +diff -r 94dee6e9176e src/share/vm/runtime/globals.hpp +--- a/src/share/vm/runtime/globals.hpp Tue Mar 31 17:58:49 2015 -0700 ++++ b/src/share/vm/runtime/globals.hpp Tue Mar 31 18:01:20 2015 -0700 +@@ -1305,6 +1305,9 @@ product(intx, TraceRedefineClasses, 0, \ "Trace level for JVMTI RedefineClasses") \ \ @@ -55,4 +56,4 @@ index 63222af..7597eda 100644 + \ develop(bool, StressMethodComparator, false, \ "Run the MethodComparator on all loaded methods") \ - \
\ No newline at end of file + \ |