Hello community,
here is the log from the commit of package java-1_9_0-openjdk for
openSUSE:Factory checked in at 2015-06-24 20:54:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_9_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_9_0-openjdk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_9_0-openjdk/java-1_9_0-openjdk.changes
2015-06-10 09:15:52.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/java-1_9_0-openjdk.changes
2015-06-24 20:54:04.000000000 +0200
@@ -1,0 +2,30 @@
+Tue Jun 23 06:48:38 UTC 2015 - [email protected]
+
+- Upgrade to upstream tag jdk9-b69
+
+-------------------------------------------------------------------
+Thu Jun 18 13:38:55 UTC 2015 - [email protected]
+
+- Use priority matching to ibm-java, always 5 bigger than it
+
+-------------------------------------------------------------------
+Mon Jun 15 08:49:19 UTC 2015 - [email protected]
+
+- Upgrade to upstream tag jdk9-b68
+- Added patches:
+ * ppc64le-emit_fd.patch
+ - fix build on PPC64LE
+ * constant_too_wide_for_long.patch
+ - fix build on 32-bit systems with older compilers
+- Modified patch:
+ * s390-size_t.patch
+ - rediff to account for changes in directory structures
+
+-------------------------------------------------------------------
+Wed Jun 10 08:16:58 UTC 2015 - [email protected]
+
+- Added patch:
+ * zero-dummy.patch
+ - Fix crash in ZERO VM built with gcc5
+
+-------------------------------------------------------------------
Old:
----
1abd45df5480.tar.bz2
4418697e56f1.tar.bz2
78c2685daaba.tar.bz2
c9785bc8ade9.tar.bz2
d47dfabd16d4.tar.bz2
f546760134eb.tar.bz2
f822b749821e.tar.bz2
fd782cd69b04.tar.bz2
New:
----
194b74467afc.tar.bz2
1bcfd6b87265.tar.bz2
551323004d0c.tar.bz2
931ec7dd6cd9.tar.bz2
constant_too_wide_for_long.patch
de8acedcb5b5.tar.bz2
f5911c6155c2.tar.bz2
f844a908d330.tar.bz2
ff0929a59ced.tar.bz2
ppc64le-emit_fd.patch
zero-dummy.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_9_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.Jcsrz4/_old 2015-06-24 20:54:07.000000000 +0200
+++ /var/tmp/diff_new_pack.Jcsrz4/_new 2015-06-24 20:54:07.000000000 +0200
@@ -33,20 +33,20 @@
%global minorver 9
%global microver 0
%global updatever 0
-%global buildver b67
+%global buildver b69
%global root_project jdk9
%global root_repository jdk9
-%global root_revision f546760134eb
-%global corba_revision 4418697e56f1
-%global hotspot_revision d47dfabd16d4
-%global jaxp_revision 78c2685daaba
-%global jaxws_revision c9785bc8ade9
-%global jdk_revision 1abd45df5480
-%global langtools_revision fd782cd69b04
-%global nashorn_revision f822b749821e
+%global root_revision 1bcfd6b87265
+%global corba_revision de8acedcb5b5
+%global hotspot_revision ff0929a59ced
+%global jaxp_revision f844a908d330
+%global jaxws_revision f5911c6155c2
+%global jdk_revision 551323004d0c
+%global langtools_revision 931ec7dd6cd9
+%global nashorn_revision 194b74467afc
%global icedtea_sound_version 1.0.1
# priority must be 6 digits in total
-%global priority %(echo "10000 * %{majorver} + 1000 * %{minorver} + 100
* %{microver} + %{updatever}" | bc)
+%global priority 1905
%global javaver %{majorver}.%{minorver}.%{microver}
# Standard JPackage directories and symbolic links.
%global sdklnk java-%{javaver}-openjdk
@@ -206,6 +206,12 @@
Patch12: adlc-parser.patch
# Fix: implicit-pointer-decl
Patch13: implicit-pointer-decl.patch
+# Fix crash with ZERO VM built with gcc5
+Patch14: zero-dummy.patch
+# Fix build on PPC64LE
+Patch15: ppc64le-emit_fd.patch
+# Fix build on 32-bit systems with older compilers
+Patch16: constant_too_wide_for_long.patch
#
# OpenJDK specific patches
#
@@ -487,6 +493,9 @@
%patch10 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
%patch99 -p1
++++++ 1abd45df5480.tar.bz2 -> 194b74467afc.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/1abd45df5480.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/194b74467afc.tar.bz2 differ:
char 11, line 1
++++++ 1abd45df5480.tar.bz2 -> 1bcfd6b87265.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/1abd45df5480.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/1bcfd6b87265.tar.bz2 differ:
char 11, line 1
++++++ fd782cd69b04.tar.bz2 -> 551323004d0c.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/fd782cd69b04.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/551323004d0c.tar.bz2 differ:
char 11, line 1
++++++ 1abd45df5480.tar.bz2 -> 931ec7dd6cd9.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/1abd45df5480.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/931ec7dd6cd9.tar.bz2 differ:
char 11, line 1
++++++ constant_too_wide_for_long.patch ++++++
--- jdk9/hotspot/src/cpu/x86/vm/vm_version_x86.hpp 2015-06-05
03:50:05.000000000 +0200
+++ jdk9/hotspot/src/cpu/x86/vm/vm_version_x86.hpp 2015-06-17
06:48:53.613627060 +0200
@@ -285,7 +285,7 @@
CPU_AVX512BW = (1 << 31)
} cpuFeatureFlags;
-#define CPU_AVX512VL 0x100000000 // EVEX instructions with smaller vector
length : enums are limited to 32bit
+#define CPU_AVX512VL 0x100000000ULL // EVEX instructions with smaller vector
length : enums are limited to 32bit
enum {
// AMD
--- jdk9/hotspot/src/share/vm/opto/compile.hpp 2015-06-05 03:50:05.000000000
+0200
+++ jdk9/hotspot/src/share/vm/opto/compile.hpp 2015-06-17 06:49:36.607727339
+0200
@@ -93,7 +93,7 @@
public:
void set_idx(node_idx_t idx) {
- _idx_clone_orig = _idx_clone_orig & 0xFFFFFFFF00000000 | idx;
+ _idx_clone_orig = _idx_clone_orig & 0xFFFFFFFF00000000ULL | idx;
}
node_idx_t idx() const { return (node_idx_t)(_idx_clone_orig & 0xFFFFFFFF); }
++++++ 1abd45df5480.tar.bz2 -> de8acedcb5b5.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/1abd45df5480.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/de8acedcb5b5.tar.bz2 differ:
char 11, line 1
++++++ 1abd45df5480.tar.bz2 -> f5911c6155c2.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/1abd45df5480.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/f5911c6155c2.tar.bz2 differ:
char 11, line 1
++++++ 1abd45df5480.tar.bz2 -> f844a908d330.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/1abd45df5480.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/f844a908d330.tar.bz2 differ:
char 11, line 1
++++++ 1abd45df5480.tar.bz2 -> ff0929a59ced.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/1abd45df5480.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/ff0929a59ced.tar.bz2 differ:
char 11, line 1
++++++ ppc64le-emit_fd.patch ++++++
--- jdk9/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp Fri Jun 05 13:40:09
2015 -0700
+++ jdk9/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp Mon Jun 08 17:39:35
2015 +0000
@@ -505,7 +505,8 @@
void VM_Version::determine_features() {
#if defined(ABI_ELFv2)
- const int code_size = (num_features+1+2*7)*BytesPerInstWord; //
TODO(asmundak): calculation is incorrect.
+ // 1 InstWord per call for the blr instruction.
+ const int code_size = (num_features+1+2*1)*BytesPerInstWord;
#else
// 7 InstWords for each call (function descriptor + blr instruction).
const int code_size = (num_features+1+2*7)*BytesPerInstWord;
@@ -540,7 +541,8 @@
a->popcntw(R7, R5); // code[6] -> popcntw
a->fcfids(F3, F4); // code[7] -> fcfids
a->vand(VR0, VR0, VR0); // code[8] -> vand
- a->lqarx_unchecked(R7, R3_ARG1, R4_ARG2, 1); // code[9] -> lqarx_m
+ // arg0 of lqarx must be an even register, (arg1 + arg2) must be a multiple
of 16
+ a->lqarx_unchecked(R6, R3_ARG1, R4_ARG2, 1); // code[9] -> lqarx_m
a->vcipher(VR0, VR1, VR2); // code[10] -> vcipher
a->vpmsumb(VR0, VR1, VR2); // code[11] -> vpmsumb
a->tcheck(0); // code[12] -> tcheck
@@ -572,7 +574,8 @@
// Execute code. Illegal instructions will be replaced by 0 in the signal
handler.
VM_Version::_is_determine_features_test_running = true;
- (*test)((address)mid_of_test_area, (uint64_t)0);
+ // We must align the first argument to 16 bytes because of the lqarx check.
+ (*test)((address)align_size_up((intptr_t)mid_of_test_area, 16), (uint64_t)0);
VM_Version::_is_determine_features_test_running = false;
// determine which instructions are legal.
@@ -614,12 +617,12 @@
MacroAssembler* a = new MacroAssembler(&cb);
// Emit code.
- uint64_t (*get_dscr)() = (uint64_t(*)())(void *)a->emit_fd();
+ uint64_t (*get_dscr)() = (uint64_t(*)())(void *)a->function_entry();
uint32_t *code = (uint32_t *)a->pc();
a->mfdscr(R3);
a->blr();
- void (*set_dscr)(long) = (void(*)(long))(void *)a->emit_fd();
+ void (*set_dscr)(long) = (void(*)(long))(void *)a->function_entry();
a->mtdscr(R3);
a->blr();
++++++ s390-size_t.patch ++++++
--- /var/tmp/diff_new_pack.Jcsrz4/_old 2015-06-24 20:54:07.000000000 +0200
+++ /var/tmp/diff_new_pack.Jcsrz4/_new 2015-06-24 20:54:07.000000000 +0200
@@ -1,6 +1,6 @@
---- jdk9/hotspot/src/share/vm/code/codeCache.cpp 2015-05-15
05:14:11.000000000 +0200
-+++ jdk9/hotspot/src/share/vm/code/codeCache.cpp 2015-05-22
18:54:41.044307022 +0200
-@@ -299,7 +299,7 @@
+--- jdk9/hotspot/src/share/vm/code/codeCache.cpp 2015-06-05
03:50:05.000000000 +0200
++++ jdk9/hotspot/src/share/vm/code/codeCache.cpp 2015-06-20
07:41:24.889631501 +0200
+@@ -300,7 +300,7 @@
_heaps->append(heap);
// Reserve Space
@@ -9,9 +9,9 @@
size_initial = round_to(size_initial, os::vm_page_size());
if (!heap->reserve(rs, size_initial, CodeCacheSegmentSize)) {
vm_exit_during_initialization("Could not reserve enough space for code
cache");
----
jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
2015-05-15 05:14:11.000000000 +0200
-+++
jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
2015-05-22 18:54:41.045306998 +0200
-@@ -2644,7 +2644,7 @@
+--- jdk9/hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.cpp
2015-06-05 03:50:05.000000000 +0200
++++ jdk9/hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.cpp
2015-06-20 07:41:24.891631541 +0200
+@@ -2627,7 +2627,7 @@
if (ResizeOldPLAB && CMSOldPLABResizeQuicker) {
size_t multiple =
_num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks);
n_blks += CMSOldPLABReactivityFactor*multiple*n_blks;
@@ -20,9 +20,9 @@
}
assert(n_blks > 0, "Error");
_cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl);
----
jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
2015-05-15 05:14:11.000000000 +0200
-+++
jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
2015-05-22 18:54:41.047306952 +0200
-@@ -794,7 +794,7 @@
+--- jdk9/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
2015-06-05 03:50:05.000000000 +0200
++++ jdk9/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
2015-06-20 07:41:24.894631601 +0200
+@@ -791,7 +791,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");
@@ -31,7 +31,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: ");
-@@ -5743,7 +5743,7 @@
+@@ -5736,7 +5736,7 @@
HeapWord* curAddr = _markBitMap.startWord();
while (curAddr < _markBitMap.endWord()) {
size_t remaining = pointer_delta(_markBitMap.endWord(), curAddr);
@@ -40,7 +40,7 @@
_markBitMap.clear_large_range(chunk);
if (ConcurrentMarkSweepThread::should_yield() &&
!foregroundGCIsActive() &&
-@@ -6027,7 +6027,7 @@
+@@ -6020,7 +6020,7 @@
return;
}
// Double capacity if possible
@@ -49,9 +49,20 @@
// 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(
---- jdk9/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
2015-05-15 05:14:11.000000000 +0200
-+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
2015-05-22 18:54:41.049306905 +0200
-@@ -3601,7 +3601,7 @@
+--- jdk9/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp 2015-06-05
03:50:05.000000000 +0200
++++ jdk9/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp 2015-06-20
07:41:24.895631621 +0200
+@@ -194,7 +194,7 @@
+ const size_t num_overflow_elems = of_stack->size();
+ const size_t space_available = queue->max_elems() - queue->size();
+ const size_t num_take_elems = MIN3(space_available / 4,
+- ParGCDesiredObjsFromOverflowList,
++ (size_t)ParGCDesiredObjsFromOverflowList,
+ num_overflow_elems);
+ // Transfer the most recent num_take_elems from the overflow
+ // stack to our work queue.
+--- jdk9/hotspot/src/share/vm/gc/g1/concurrentMark.cpp 2015-06-05
03:50:05.000000000 +0200
++++ jdk9/hotspot/src/share/vm/gc/g1/concurrentMark.cpp 2015-06-20
07:41:24.897631661 +0200
+@@ -3512,7 +3512,7 @@
// of things to do) or totally (at the very end).
size_t target_size;
if (partially) {
@@ -60,9 +71,9 @@
} else {
target_size = 0;
}
---- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
2015-05-15 05:14:11.000000000 +0200
-+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
2015-05-22 18:54:41.050306882 +0200
-@@ -1611,7 +1611,7 @@
+--- jdk9/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp 2015-06-05
03:50:05.000000000 +0200
++++ jdk9/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp 2015-06-20
07:41:24.899631702 +0200
+@@ -1595,7 +1595,7 @@
verify_region_sets_optional();
@@ -71,8 +82,8 @@
ergo_verbose1(ErgoHeapSizing,
"attempt heap expansion",
ergo_format_reason("allocation request failed")
---- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp
2015-05-15 05:14:11.000000000 +0200
-+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp
2015-05-22 19:41:46.310837857 +0200
+--- jdk9/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.hpp
2015-06-05 03:50:05.000000000 +0200
++++ jdk9/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.hpp
2015-06-20 07:41:24.900631722 +0200
@@ -89,7 +89,7 @@
void pretouch_internal(size_t start_page, size_t end_page);
@@ -82,31 +93,20 @@
// Returns the address of the given page index.
char* page_start(size_t index) const;
---- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
2015-05-15 05:14:11.000000000 +0200
-+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
2015-05-22 18:54:41.051306859 +0200
-@@ -42,7 +42,7 @@
- _cancel(false),
- _empty(true),
- _dropped(0) {
-- _nqueues = MAX2(ParallelGCThreads, (size_t)1);
-+ _nqueues = MAX2((size_t)ParallelGCThreads, (size_t)1);
- _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);
---- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
2015-05-15 05:14:11.000000000 +0200
-+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
2015-05-22 18:54:41.051306859 +0200
-@@ -112,7 +112,7 @@
- };
-
- G1StringDedupEntryCache::G1StringDedupEntryCache() {
-- _nlists = MAX2(ParallelGCThreads, (size_t)1);
-+ _nlists = MAX2((size_t)ParallelGCThreads, (size_t)1);
- _lists = PaddedArray<G1StringDedupEntryFreeList,
mtGC>::create_unfreeable((uint)_nlists);
- }
-
----
jdk9/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
2015-05-15 05:14:11.000000000 +0200
-+++
jdk9/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
2015-05-22 18:54:41.052306836 +0200
-@@ -901,8 +901,8 @@
+--- jdk9/hotspot/src/share/vm/gc/parallel/psCompactionManager.inline.hpp
2015-06-05 03:50:05.000000000 +0200
++++ jdk9/hotspot/src/share/vm/gc/parallel/psCompactionManager.inline.hpp
2015-06-20 07:42:04.478427916 +0200
+@@ -119,7 +119,7 @@
+ const size_t beg_index = size_t(index);
+ assert(beg_index < len || len == 0, "index too large");
+
+- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
++ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
+ const size_t end_index = beg_index + stride;
+ T* const base = (T*)obj->base();
+ T* const beg = base + beg_index;
+--- jdk9/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp
2015-06-05 03:50:05.000000000 +0200
++++ jdk9/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp
2015-06-20 07:41:24.902631762 +0200
+@@ -892,8 +892,8 @@
void PSParallelCompact::initialize_dead_wood_limiter()
{
const size_t max = 100;
@@ -117,19 +117,19 @@
_dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev);
DEBUG_ONLY(_dwl_initialized = true;)
_dwl_adjustment = normal_distribution(1.0);
---- jdk9/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
2015-05-15 05:14:11.000000000 +0200
-+++ jdk9/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
2015-05-22 18:54:41.053306812 +0200
-@@ -193,7 +193,7 @@
- const size_t num_overflow_elems = of_stack->size();
- const size_t space_available = queue->max_elems() - queue->size();
- const size_t num_take_elems = MIN3(space_available / 4,
-- ParGCDesiredObjsFromOverflowList,
-+ (size_t)ParGCDesiredObjsFromOverflowList,
- num_overflow_elems);
- // Transfer the most recent num_take_elems from the overflow
- // stack to our work queue.
---- jdk9/hotspot/src/share/vm/memory/collectorPolicy.cpp 2015-05-15
05:14:11.000000000 +0200
-+++ jdk9/hotspot/src/share/vm/memory/collectorPolicy.cpp 2015-05-22
18:54:41.053306812 +0200
+--- jdk9/hotspot/src/share/vm/gc/serial/markSweep.cpp 2015-06-05
03:50:05.000000000 +0200
++++ jdk9/hotspot/src/share/vm/gc/serial/markSweep.cpp 2015-06-20
07:41:24.902631762 +0200
+@@ -183,7 +183,7 @@
+ const size_t beg_index = size_t(index);
+ assert(beg_index < len || len == 0, "index too large");
+
+- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
++ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
+ const size_t end_index = beg_index + stride;
+ T* const base = (T*)a->base();
+ T* const beg = base + beg_index;
+--- jdk9/hotspot/src/share/vm/gc/shared/collectorPolicy.cpp 2015-06-05
03:50:05.000000000 +0200
++++ jdk9/hotspot/src/share/vm/gc/shared/collectorPolicy.cpp 2015-06-20
07:41:24.903631782 +0200
@@ -449,7 +449,7 @@
// yield a size that is too small) and bound it by MaxNewSize above.
// Ergonomics plays here by previously calculating the desired
@@ -148,9 +148,20 @@
}
}
---- jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2015-05-15
05:14:11.000000000 +0200
-+++ jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2015-05-22
18:54:41.055306766 +0200
-@@ -1453,7 +1453,7 @@
+--- jdk9/hotspot/src/share/vm/gc/shared/plab.cpp 2015-06-05
03:50:05.000000000 +0200
++++ jdk9/hotspot/src/share/vm/gc/shared/plab.cpp 2015-06-20
08:06:45.445118793 +0200
+@@ -31,7 +31,7 @@
+
+ size_t PLAB::min_size() {
+ // Make sure that we return something that is larger than AlignmentReserve
+- return align_object_size(MAX2(MinTLABSize / HeapWordSize,
(uintx)oopDesc::header_size())) + AlignmentReserve;
++ return align_object_size(MAX2(MinTLABSize / HeapWordSize,
(size_t)oopDesc::header_size())) + AlignmentReserve;
+ }
+
+ size_t PLAB::max_size() {
+--- jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2015-06-05
03:50:05.000000000 +0200
++++ jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2015-06-20
07:41:24.905631822 +0200
+@@ -1434,7 +1434,7 @@
void MetaspaceGC::post_initialize() {
// Reset the high-water mark once the VM initialization is done.
@@ -159,7 +170,7 @@
}
bool MetaspaceGC::can_expand(size_t word_size, bool is_class) {
-@@ -1513,7 +1513,7 @@
+@@ -1494,7 +1494,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,
@@ -168,7 +179,7 @@
if (PrintGCDetails && Verbose) {
gclog_or_tty->print_cr("\nMetaspaceGC::compute_new_size: ");
-@@ -1572,7 +1572,7 @@
+@@ -1553,7 +1553,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,
@@ -177,7 +188,7 @@
if (PrintGCDetails && Verbose) {
gclog_or_tty->print_cr(" "
" maximum_free_percentage: %6.2f"
-@@ -3309,7 +3309,7 @@
+@@ -3290,7 +3290,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,
@@ -186,8 +197,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.
---- jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2015-05-15
05:14:11.000000000 +0200
-+++ jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2015-05-22
18:54:41.056306743 +0200
+--- jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2015-06-05
03:50:05.000000000 +0200
++++ jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2015-06-20
07:41:24.906631842 +0200
@@ -738,7 +738,7 @@
WB_END
@@ -197,8 +208,8 @@
if (GetVMFlag <size_t> (thread, env, name, &result,
&CommandLineFlags::size_tAt)) {
ThreadToNativeFromVM ttnfv(thread); // can't be in VM when we call JNI
return longBox(thread, env, result);
---- jdk9/hotspot/src/share/vm/runtime/arguments.cpp 2015-05-15
05:14:11.000000000 +0200
-+++ jdk9/hotspot/src/share/vm/runtime/arguments.cpp 2015-05-22
18:54:41.057306720 +0200
+--- jdk9/hotspot/src/share/vm/runtime/arguments.cpp 2015-06-05
03:50:05.000000000 +0200
++++ jdk9/hotspot/src/share/vm/runtime/arguments.cpp 2015-06-20
07:41:24.907631862 +0200
@@ -1118,7 +1118,7 @@
// Increase the code cache size - tiered compiles a lot more.
if (FLAG_IS_DEFAULT(ReservedCodeCacheSize)) {
@@ -208,8 +219,8 @@
}
// Enable SegmentedCodeCache if TieredCompilation is enabled and
ReservedCodeCacheSize >= 240M
if (FLAG_IS_DEFAULT(SegmentedCodeCache) && ReservedCodeCacheSize >= 240*M) {
---- jdk9/hotspot/src/share/vm/runtime/arguments.hpp 2015-05-15
05:14:11.000000000 +0200
-+++ jdk9/hotspot/src/share/vm/runtime/arguments.hpp 2015-05-22
18:54:41.058306696 +0200
+--- jdk9/hotspot/src/share/vm/runtime/arguments.hpp 2015-06-05
03:50:05.000000000 +0200
++++ jdk9/hotspot/src/share/vm/runtime/arguments.hpp 2015-06-20
07:41:24.907631862 +0200
@@ -283,7 +283,7 @@
// Value of the conservative maximum heap alignment needed
static size_t _conservative_max_heap_alignment;
++++++ zero-dummy.patch ++++++
diff -urEbwB jdk9/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
jdk9/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
--- jdk9/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2015-06-09
08:42:39.176218692 +0200
+++ jdk9/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2015-06-10
10:14:30.460811115 +0200
@@ -59,8 +59,8 @@
extern sigjmp_buf* get_jmp_buf_for_continuation();
address os::current_stack_pointer() {
- address dummy = (address) &dummy;
- return dummy;
+ // return the address of the current function
+ return (address)__builtin_frame_address(0);
}
frame os::get_sender_for_C_frame(frame* fr) {
Only in jdk9/hotspot/src/os_cpu/linux_zero/vm: os_linux_zero.cpp.orig
