rpm/java-1_8_0-openjdk
SHA256
1
0
Fork 0
forked from pool/java-1_8_0-openjdk
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=44

Browse Source
This commit is contained in:
Fridrich Strba 2014-11-11 17:19:51 +00:00 committed by Git OBS Bridge
parent 6ab031c0f8
commit c8dc3123b2
3 changed files with 80 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java-1_8_0-openjdk.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Nov 11 17:18:21 UTC 2014 - fstrba@suse.com
- Modified patches:
* s390-size_t.patch
- rediff and drop unnecessary chunks
* s390-java-opts.patch
- modify to correspond to the changed context
-------------------------------------------------------------------
Mon Nov 10 14:55:35 UTC 2014 - fstrba@suse.com

42
s390-java-opts.patch
View File

@ -1,17 +1,27 @@
--- jdk8/common/autoconf/boot-jdk.m4 2014-06-18 21:34:07.000000000 +0200
+++ jdk8/common/autoconf/boot-jdk.m4 2014-07-09 22:00:05.272599977 +0200
@@ -315,12 +315,12 @@
fi
diff -urEbwB jdk8/common/autoconf/boot-jdk.m4 jdk8/common/autoconf/boot-jdk.m4
--- jdk8/common/autoconf/boot-jdk.m4 2014-10-28 18:10:36.000000000 +0100
+++ jdk8/common/autoconf/boot-jdk.m4 2014-11-11 12:54:41.698246995 +0100
@@ -319,21 +319,12 @@
AC_MSG_CHECKING([flags for boot jdk java command for big workloads])
# Minimum amount of heap memory.
- ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs,[$JAVA])
+ ADD_JVM_ARG_IF_OK([-Xms256M],boot_jdk_jvmargs,[$JAVA])
if test "x$OPENJDK_TARGET_OS" = "xmacosx" || test "x$OPENJDK_TARGET_CPU" = "xppc64" ; then
# Why does macosx need more heap? Its the huge JDK batch.
ADD_JVM_ARG_IF_OK([-Xmx1600M],boot_jdk_jvmargs,[$JAVA])
else
- ADD_JVM_ARG_IF_OK([-Xmx1100M],boot_jdk_jvmargs,[$JAVA])
+ ADD_JVM_ARG_IF_OK([-Xmx768M],boot_jdk_jvmargs,[$JAVA])
fi
# When is adding -client something that speeds up the JVM?
# ADD_JVM_ARG_IF_OK([-client],boot_jdk_jvmargs,[$JAVA])
# Starting amount of heap memory.
- ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
+ ADD_JVM_ARG_IF_OK([-Xms256M],boot_jdk_jvmargs_big,[$JAVA])
# Maximum amount of heap memory.
# Maximum stack size.
- if test "x$BUILD_NUM_BITS" = x32; then
- JVM_MAX_HEAP=1100M
+ JVM_MAX_HEAP=768M
STACK_SIZE=768
- else
- # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit
- # pointers are used. Apparently, we need to increase the heap and stack
- # space for the jvm. More specifically, when running javac to build huge
- # jdk batch
- JVM_MAX_HEAP=1600M
- STACK_SIZE=1536
- fi
ADD_JVM_ARG_IF_OK([-Xmx$JVM_MAX_HEAP],boot_jdk_jvmargs_big,[$JAVA])
ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs_big,[$JAVA])
ADD_JVM_ARG_IF_OK([-XX:PermSize=32m],boot_jdk_jvmargs_big,[$JAVA])

110
s390-size_t.patch
View File

@ -1,6 +1,6 @@
--- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2014-07-03 21:56:12.000000000 +0200
+++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2014-07-11 13:41:53.568013676 +0200
@@ -2686,7 +2686,7 @@
--- 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
@@ -2659,7 +2659,7 @@
if (ResizeOldPLAB && CMSOldPLABResizeQuicker) {
size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks);
n_blks += CMSOldPLABReactivityFactor*multiple*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-07-03 21:56:12.000000000 +0200
+++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2014-07-11 13:58:22.740341755 +0200
@@ -950,7 +950,7 @@
--- 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 @@
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: ");
@@ -6559,7 +6559,7 @@
@@ -6569,7 +6569,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() &&
@@ -6858,7 +6858,7 @@
@@ -6868,7 +6868,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-07-03 21:56:12.000000000 +0200
+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2014-07-11 13:57:11.817966591 +0200
@@ -3767,7 +3767,7 @@
--- 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 @@
// 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-07-03 21:56:12.000000000 +0200
+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2014-07-11 13:41:53.582013356 +0200
@@ -1730,7 +1730,7 @@
--- 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 @@
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-07-03 21:56:12.000000000 +0200
+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2014-07-11 15:59:18.899087161 +0200
--- 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
@@ -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-07-03 21:56:12.000000000 +0200
+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2014-07-11 16:09:06.970540320 +0200
--- 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
@@ -110,7 +110,7 @@
};
@ -82,30 +82,19 @@
_lists = PaddedArray<G1StringDedupEntryFreeList, mtGC>::create_unfreeable((uint)_nlists);
}
--- jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2014-07-03 21:56:12.000000000 +0200
+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2014-07-11 13:41:53.582013356 +0200
@@ -160,7 +160,7 @@
--- 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
@@ -147,7 +147,7 @@
if (FLAG_IS_DEFAULT(G1HeapRegionSize)) {
size_t average_heap_size = (initial_heap_size + max_heap_size) / 2;
region_size = MAX2(average_heap_size / TARGET_REGION_NUMBER,
- (uintx) MIN_REGION_SIZE);
+ (size_t) MIN_REGION_SIZE);
region_size = MAX2(average_heap_size / HeapRegionBounds::target_number(),
- (uintx) HeapRegionBounds::min_size());
+ (size_t) HeapRegionBounds::min_size());
}
int region_size_log = log2_long((jlong) region_size);
--- jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2014-07-03 21:56:12.000000000 +0200
+++ jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2014-07-11 17:39:05.464946601 +0200
@@ -71,7 +71,7 @@
if (_virtual_space != NULL && _virtual_space->expand_by(_reserved_byte_size)) {
_region_start = covered_region.start();
_region_size = covered_region.word_size();
- idx_t* map = (idx_t*)_virtual_space->reserved_low_addr();
+ BitMap::bm_word_t* map = (BitMap::bm_word_t*)_virtual_space->reserved_low_addr();
_beg_bits.set_map(map);
_beg_bits.set_size(bits / 2);
_end_bits.set_map(map + words / 2);
--- jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2014-07-03 21:56:12.000000000 +0200
+++ jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2014-07-11 13:41:53.584013310 +0200
--- 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
@@ -910,8 +910,8 @@
void PSParallelCompact::initialize_dead_wood_limiter()
{
@ -117,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-07-03 21:56:12.000000000 +0200
+++ jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2014-07-11 13:41:53.585013287 +0200
--- 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
@@ -194,7 +194,7 @@
const size_t num_overflow_elems = of_stack->size();
const size_t space_available = queue->max_elems() - queue->size();
@ -128,8 +117,8 @@
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-07-03 21:56:12.000000000 +0200
+++ jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp 2014-07-11 13:38:14.060047977 +0200
--- 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 @@
uintx calculated_size = NewSize + OldSize;
double shrink_factor = (double) MaxHeapSize / calculated_size;
@ -186,9 +175,9 @@
_initial_gen1_size = OldSize;
// If the user has explicitly set an OldSize that is inconsistent
--- jdk8/hotspot/src/share/vm/memory/metaspace.cpp 2014-07-03 21:56:12.000000000 +0200
+++ jdk8/hotspot/src/share/vm/memory/metaspace.cpp 2014-07-11 16:19:00.043879052 +0200
@@ -1431,7 +1431,7 @@
--- 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
@@ -1455,7 +1455,7 @@
void MetaspaceGC::post_initialize() {
// Reset the high-water mark once the VM initialization is done.
@ -197,7 +186,7 @@
}
bool MetaspaceGC::can_expand(size_t word_size, bool is_class) {
@@ -1491,7 +1491,7 @@
@@ -1515,7 +1515,7 @@
(size_t)MIN2(min_tmp, double(max_uintx));
// Don't shrink less than the initial generation size
minimum_desired_capacity = MAX2(minimum_desired_capacity,
@ -206,7 +195,7 @@
if (PrintGCDetails && Verbose) {
gclog_or_tty->print_cr("\nMetaspaceGC::compute_new_size: ");
@@ -1546,7 +1546,7 @@
@@ -1573,7 +1573,7 @@
const double max_tmp = used_after_gc / minimum_used_percentage;
size_t maximum_desired_capacity = (size_t)MIN2(max_tmp, double(max_uintx));
maximum_desired_capacity = MAX2(maximum_desired_capacity,
@ -215,7 +204,7 @@
if (PrintGCDetails && Verbose) {
gclog_or_tty->print_cr(" "
" maximum_free_percentage: %6.2f"
@@ -3197,7 +3197,7 @@
@@ -3235,7 +3235,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,
@ -224,8 +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-07-03 21:56:12.000000000 +0200
+++ jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2014-07-11 17:50:56.051695703 +0200
--- 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;
@ -235,8 +224,8 @@
} 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-07-03 21:56:12.000000000 +0200
+++ jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2014-07-11 13:41:56.743940848 +0200
--- 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
@@ -48,7 +48,7 @@
const size_t beg_index = size_t(index);
assert(beg_index < len || len == 0, "index too large");
@ -255,9 +244,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-07-03 21:56:12.000000000 +0200
+++ jdk8/hotspot/src/share/vm/runtime/arguments.cpp 2014-07-11 11:47:11.845740259 +0200
@@ -1244,7 +1244,7 @@
--- 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 @@
// 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
@ -266,7 +255,7 @@
} else {
FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size);
}
@@ -1269,8 +1269,8 @@
@@ -1275,8 +1275,8 @@
// Unless explicitly requested otherwise, make young gen
// at least min_new, and at most preferred_max_new_size.
if (FLAG_IS_DEFAULT(NewSize)) {
@ -277,7 +266,7 @@
if (PrintGCDetails && Verbose) {
// Too early to use gclog_or_tty
tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize);
@@ -1280,7 +1280,7 @@
@@ -1286,7 +1286,7 @@
// so it's NewRatio x of NewSize.
if (FLAG_IS_DEFAULT(OldSize)) {
if (max_heap > NewSize) {
@ -286,12 +275,3 @@
if (PrintGCDetails && Verbose) {
// Too early to use gclog_or_tty
tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);
@@ -1401,7 +1401,7 @@
return true;
}
-uintx Arguments::max_heap_for_compressed_oops() {
+size_t Arguments::max_heap_for_compressed_oops() {
// Avoid sign flip.
assert(OopEncodingHeapMax > (uint64_t)os::vm_page_size(), "Unusual page size");
// We need to fit both the NULL page and the heap into the memory budget, while