From 0f71a41872cc2d445d3b4848e976695031d724e57aca952611b79b5209d29e0f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 6 Feb 2015 11:47:18 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=68 --- java-1_8_0-openjdk.changes | 3 ++ s390-size_t.patch | 89 +++++++++++++++++--------------------- 2 files changed, 42 insertions(+), 50 deletions(-) diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes index 1db66a0..21aaba0 100644 --- a/java-1_8_0-openjdk.changes +++ b/java-1_8_0-openjdk.changes @@ -8,6 +8,9 @@ Thu Feb 5 09:55:30 UTC 2015 - fstrba@suse.com * aarch64-b12tob22.patch - Not needed since the aarch64 tarball is on a recent enough tag +- Modified patch + * s390-size_t.patch + - Adapt to hotspot changes ------------------------------------------------------------------- Tue Jan 27 07:52:58 UTC 2015 - fstrba@suse.com diff --git a/s390-size_t.patch b/s390-size_t.patch index 3fffcf3..ae0a3fc 100644 --- a/s390-size_t.patch +++ b/s390-size_t.patch @@ -1,5 +1,5 @@ ---- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2014-10-24 00:32:14.000000000 +0200 -+++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2014-11-11 10:57:53.830473761 +0100 +--- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2015-02-06 12:41:58.252468796 +0100 ++++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2015-02-06 12:42:56.781083256 +0100 @@ -2659,7 +2659,7 @@ if (ResizeOldPLAB && CMSOldPLABResizeQuicker) { size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks); @@ -9,9 +9,9 @@ } assert(n_blks > 0, "Error"); _cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl); ---- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2014-10-24 00:32:14.000000000 +0200 -+++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2014-11-11 10:57:53.832473717 +0100 -@@ -951,7 +951,7 @@ +--- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-02-06 12:41:58.252468796 +0100 ++++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-02-06 12:42:56.784083185 +0100 +@@ -957,7 +957,7 @@ if (free_percentage < desired_free_percentage) { size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage)); assert(desired_capacity >= capacity(), "invalid expansion size"); @@ -20,7 +20,7 @@ if (PrintGCDetails && Verbose) { size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage)); gclog_or_tty->print_cr("\nFrom compute_new_size: "); -@@ -6569,7 +6569,7 @@ +@@ -6575,7 +6575,7 @@ HeapWord* curAddr = _markBitMap.startWord(); while (curAddr < _markBitMap.endWord()) { size_t remaining = pointer_delta(_markBitMap.endWord(), curAddr); @@ -29,7 +29,7 @@ _markBitMap.clear_large_range(chunk); if (ConcurrentMarkSweepThread::should_yield() && !foregroundGCIsActive() && -@@ -6868,7 +6868,7 @@ +@@ -6874,7 +6874,7 @@ return; } // Double capacity if possible @@ -38,9 +38,9 @@ // Do not give up existing stack until we have managed to // get the double capacity that we desired. ReservedSpace rs(ReservedSpace::allocation_align_size_up( ---- jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2014-10-24 00:32:14.000000000 +0200 -+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2014-11-11 10:57:53.833473694 +0100 -@@ -3891,7 +3891,7 @@ +--- jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2015-02-06 12:41:58.253468772 +0100 ++++ jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2015-02-06 12:42:56.785083162 +0100 +@@ -3902,7 +3902,7 @@ // of things to do) or totally (at the very end). size_t target_size; if (partially) { @@ -49,9 +49,9 @@ } else { target_size = 0; } ---- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2014-10-24 00:32:14.000000000 +0200 -+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2014-11-11 10:57:53.834473671 +0100 -@@ -1737,7 +1737,7 @@ +--- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2015-02-06 12:41:58.254468748 +0100 ++++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2015-02-06 12:42:56.787083115 +0100 +@@ -1738,7 +1738,7 @@ verify_region_sets_optional(); @@ -60,8 +60,8 @@ ergo_verbose1(ErgoHeapSizing, "attempt heap expansion", ergo_format_reason("allocation request failed") ---- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2014-10-24 00:32:14.000000000 +0200 -+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2014-11-11 10:57:53.835473648 +0100 +--- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2015-02-06 12:41:58.255468724 +0100 ++++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2015-02-06 12:42:56.787083115 +0100 @@ -38,7 +38,7 @@ _cancel(false), _empty(true), @@ -71,8 +71,8 @@ _queues = NEW_C_HEAP_ARRAY(G1StringDedupWorkerQueue, _nqueues, mtGC); for (size_t i = 0; i < _nqueues; i++) { new (_queues + i) G1StringDedupWorkerQueue(G1StringDedupWorkerQueue::default_segment_size(), _max_cache_size, _max_size); ---- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2014-10-24 00:32:14.000000000 +0200 -+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2014-11-11 10:57:53.835473648 +0100 +--- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2015-02-06 12:41:58.255468724 +0100 ++++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2015-02-06 12:42:56.788083092 +0100 @@ -110,7 +110,7 @@ }; @@ -82,8 +82,8 @@ _lists = PaddedArray::create_unfreeable((uint)_nlists); } ---- jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2014-10-24 00:32:14.000000000 +0200 -+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2014-11-11 10:58:23.037813943 +0100 +--- jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2015-02-06 12:41:58.256468700 +0100 ++++ jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2015-02-06 12:42:56.788083092 +0100 @@ -147,7 +147,7 @@ if (FLAG_IS_DEFAULT(G1HeapRegionSize)) { size_t average_heap_size = (initial_heap_size + max_heap_size) / 2; @@ -93,8 +93,8 @@ } int region_size_log = log2_long((jlong) region_size); ---- jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2014-10-24 00:32:14.000000000 +0200 -+++ jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2014-11-11 10:57:59.372348578 +0100 +--- jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2015-02-06 12:41:58.258468651 +0100 ++++ jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2015-02-06 12:42:56.789083068 +0100 @@ -910,8 +910,8 @@ void PSParallelCompact::initialize_dead_wood_limiter() { @@ -106,8 +106,8 @@ _dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev); DEBUG_ONLY(_dwl_initialized = true;) _dwl_adjustment = normal_distribution(1.0); ---- jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2014-10-24 00:32:14.000000000 +0200 -+++ jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2014-11-11 10:57:59.372348578 +0100 +--- jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2015-02-06 12:41:58.257468675 +0100 ++++ jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2015-02-06 12:42:56.790083045 +0100 @@ -194,7 +194,7 @@ const size_t num_overflow_elems = of_stack->size(); const size_t space_available = queue->max_elems() - queue->size(); @@ -117,9 +117,9 @@ num_overflow_elems); // Transfer the most recent num_take_elems from the overflow // stack to our work queue. ---- jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp 2014-10-24 00:32:14.000000000 +0200 -+++ jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp 2014-11-11 10:57:59.373348555 +0100 -@@ -389,7 +389,7 @@ +--- jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp 2015-02-06 12:41:58.263468530 +0100 ++++ jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp 2015-02-06 12:42:56.790083045 +0100 +@@ -385,7 +385,7 @@ uintx calculated_size = NewSize + OldSize; double shrink_factor = (double) MaxHeapSize / calculated_size; uintx smaller_new_size = align_size_down((uintx)(NewSize * shrink_factor), _gen_alignment); @@ -128,7 +128,7 @@ _initial_gen0_size = NewSize; // OldSize is already aligned because above we aligned MaxHeapSize to -@@ -437,7 +437,7 @@ +@@ -433,7 +433,7 @@ // yield a size that is too small) and bound it by MaxNewSize above. // Ergonomics plays here by previously calculating the desired // NewSize and MaxNewSize. @@ -137,7 +137,7 @@ } assert(max_new_size > 0, "All paths should set max_new_size"); -@@ -459,23 +459,23 @@ +@@ -455,23 +455,23 @@ // lower limit. _min_gen0_size = NewSize; desired_new_size = NewSize; @@ -166,7 +166,7 @@ } assert(_min_gen0_size > 0, "Sanity check"); -@@ -577,7 +577,7 @@ +@@ -573,7 +573,7 @@ } else { // It's been explicitly set on the command line. Use the // OldSize and then determine the consequences. @@ -175,8 +175,8 @@ _initial_gen1_size = OldSize; // If the user has explicitly set an OldSize that is inconsistent ---- jdk8/hotspot/src/share/vm/memory/metaspace.cpp 2014-10-24 00:32:14.000000000 +0200 -+++ jdk8/hotspot/src/share/vm/memory/metaspace.cpp 2014-11-11 10:57:59.374348532 +0100 +--- jdk8/hotspot/src/share/vm/memory/metaspace.cpp 2015-02-06 12:41:58.264468506 +0100 ++++ jdk8/hotspot/src/share/vm/memory/metaspace.cpp 2015-02-06 12:42:56.791083021 +0100 @@ -1455,7 +1455,7 @@ void MetaspaceGC::post_initialize() { @@ -204,7 +204,7 @@ if (PrintGCDetails && Verbose) { gclog_or_tty->print_cr(" " " maximum_free_percentage: %6.2f" -@@ -3235,7 +3235,7 @@ +@@ -3245,7 +3245,7 @@ // on the medium chunk list. The next chunk will be small and progress // from there. This size calculated by -version. _first_class_chunk_word_size = MIN2((size_t)MediumChunk*6, @@ -213,19 +213,8 @@ _first_class_chunk_word_size = align_word_size_up(_first_class_chunk_word_size); // Arbitrarily set the initial virtual space to a multiple // of the boot class loader size. ---- jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2014-10-24 00:32:14.000000000 +0200 -+++ jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2014-11-11 10:57:59.374348532 +0100 -@@ -238,7 +238,7 @@ - size_t init_sz; - - if (TLABSize > 0) { -- init_sz = MIN2(TLABSize / HeapWordSize, max_size()); -+ init_sz = MIN2((size_t)(TLABSize / HeapWordSize), max_size()); - } else if (global_stats() == NULL) { - // Startup issue - main thread initialized before heap initialized. - init_sz = min_size(); ---- jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2014-10-24 00:32:14.000000000 +0200 -+++ jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2014-11-11 10:57:59.374348532 +0100 +--- jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2015-02-06 12:41:58.267468433 +0100 ++++ jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2015-02-06 12:42:56.792082998 +0100 @@ -48,7 +48,7 @@ const size_t beg_index = size_t(index); assert(beg_index < len || len == 0, "index too large"); @@ -244,9 +233,9 @@ const size_t end_index = beg_index + stride; T* const base = (T*)a->base(); T* const beg = base + beg_index; ---- jdk8/hotspot/src/share/vm/runtime/arguments.cpp 2014-10-24 00:32:14.000000000 +0200 -+++ jdk8/hotspot/src/share/vm/runtime/arguments.cpp 2014-11-11 10:57:59.376348487 +0100 -@@ -1250,7 +1250,7 @@ +--- jdk8/hotspot/src/share/vm/runtime/arguments.cpp 2015-02-06 12:41:58.277468191 +0100 ++++ jdk8/hotspot/src/share/vm/runtime/arguments.cpp 2015-02-06 12:42:56.794082951 +0100 +@@ -1277,7 +1277,7 @@ // NewSize was set on the command line and it is larger than // preferred_max_new_size. if (!FLAG_IS_DEFAULT(NewSize)) { // NewSize explicitly set at command-line @@ -255,7 +244,7 @@ } else { FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size); } -@@ -1275,8 +1275,8 @@ +@@ -1302,8 +1302,8 @@ // Unless explicitly requested otherwise, make young gen // at least min_new, and at most preferred_max_new_size. if (FLAG_IS_DEFAULT(NewSize)) { @@ -266,7 +255,7 @@ if (PrintGCDetails && Verbose) { // Too early to use gclog_or_tty tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize); -@@ -1286,7 +1286,7 @@ +@@ -1313,7 +1313,7 @@ // so it's NewRatio x of NewSize. if (FLAG_IS_DEFAULT(OldSize)) { if (max_heap > NewSize) {