Hello community,
here is the log from the commit of package java-1_9_0-openjdk for
openSUSE:Factory checked in at 2015-06-02 10:07:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-05-15 07:43:48.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/java-1_9_0-openjdk.changes
2015-06-02 10:07:27.000000000 +0200
@@ -1,0 +2,23 @@
+Sun May 24 20:58:36 UTC 2015 - [email protected]
+
+- Added patch:
+ * eventFilter.patch
+ - fix build with gcc5 that is picky about missing brackets.
+
+-------------------------------------------------------------------
+Fri May 22 08:17:59 UTC 2015 - [email protected]
+
+- Upgrade to upstream tag jdk9-b65
+- Removed patch:
+ * system-giflib5.patch
+ - fixed upstream
+- Added patch:
+ * giflib.patch
+ - Allow building with system giflib versions before 5.1
+- Modified patch:
+ * s390-size_t.patch
+ - Rediff to a new context and code state.
+- Add --disable-warnings-as-errors to the configure line
+ * avoiding to fail on first little warning.
+
+-------------------------------------------------------------------
@@ -5 +28 @@
-- Remove patch:
+- Removed patch:
Old:
----
105d045a6917.tar.bz2
1b5604bc81a6.tar.bz2
1eab877142cc.tar.bz2
3bcf83c1bbc1.tar.bz2
40058141a4ec.tar.bz2
49118e68fbd4.tar.bz2
cd0cf72b2cbf.tar.bz2
d27f7e0a7aca.tar.bz2
system-giflib5.patch
New:
----
2054d01ae326.tar.bz2
45ef73bb85c1.tar.bz2
4fcf722b8114.tar.bz2
7c31f9d7b932.tar.bz2
ae7406e82828.tar.bz2
afc1e295c4bf.tar.bz2
e7ae94c4f35e.tar.bz2
ed94f3e7ba6b.tar.bz2
eventFilter.patch
giflib.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_9_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.rbUjuB/_old 2015-06-02 10:07:29.000000000 +0200
+++ /var/tmp/diff_new_pack.rbUjuB/_new 2015-06-02 10:07:29.000000000 +0200
@@ -33,17 +33,17 @@
%global minorver 9
%global microver 0
%global updatever 0
-%global buildver b62
+%global buildver b65
%global root_project jdk9
%global root_repository jdk9
-%global root_revision 105d045a6917
-%global corba_revision d27f7e0a7aca
-%global hotspot_revision 1eab877142cc
-%global jaxp_revision 3bcf83c1bbc1
-%global jaxws_revision cd0cf72b2cbf
-%global jdk_revision 49118e68fbd4
-%global langtools_revision 40058141a4ec
-%global nashorn_revision 1b5604bc81a6
+%global root_revision 7c31f9d7b932
+%global corba_revision afc1e295c4bf
+%global hotspot_revision e7ae94c4f35e
+%global jaxp_revision ae7406e82828
+%global jaxws_revision 45ef73bb85c1
+%global jdk_revision ed94f3e7ba6b
+%global langtools_revision 4fcf722b8114
+%global nashorn_revision 2054d01ae326
%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)
@@ -218,8 +218,10 @@
Patch103: ppc-zero-hotspot.patch
# Patches for system libraries
Patch203: fix-system-jpeg-loading.patch
-Patch204: system-giflib5.patch
+Patch204: giflib.patch
Patch205: link-with-as-needed.patch
+# GCC 5 is quite picky
+Patch500: eventFilter.patch
BuildRequires: alsa-lib-devel
BuildRequires: autoconf
BuildRequires: automake
@@ -498,6 +500,8 @@
%patch103 -p1
%endif
+%patch500 -p1
+
# Extract systemtap tapsets
%if %{with_systemtap}
@@ -559,6 +563,7 @@
pushd %{buildoutputdir}
bash ../configure \
+ --disable-warnings-as-errors \
%if %{with zero}
--with-jvm-variants=zero \
%endif
++++++ 105d045a6917.tar.bz2 -> 2054d01ae326.tar.bz2 ++++++
++++ 550618 lines of diff (skipped)
++++++ 105d045a6917.tar.bz2 -> 45ef73bb85c1.tar.bz2 ++++++
++++ 696649 lines of diff (skipped)
++++++ 105d045a6917.tar.bz2 -> 4fcf722b8114.tar.bz2 ++++++
++++ 754834 lines of diff (skipped)
++++++ 105d045a6917.tar.bz2 -> 7c31f9d7b932.tar.bz2 ++++++
++++ 9342 lines of diff (skipped)
++++++ 105d045a6917.tar.bz2 -> ae7406e82828.tar.bz2 ++++++
++++ 828624 lines of diff (skipped)
++++++ 105d045a6917.tar.bz2 -> afc1e295c4bf.tar.bz2 ++++++
++++ 355492 lines of diff (skipped)
++++++ 105d045a6917.tar.bz2 -> e7ae94c4f35e.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/105d045a6917.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/e7ae94c4f35e.tar.bz2 differ:
char 11, line 1
++++++ 105d045a6917.tar.bz2 -> ed94f3e7ba6b.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/105d045a6917.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/ed94f3e7ba6b.tar.bz2 differ:
char 11, line 1
++++++ eventFilter.patch ++++++
--- a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c 2015-05-24
18:57:24.111193218 +0200
+++ b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c 2015-05-24
19:00:11.327301708 +0200
@@ -518,8 +518,7 @@
case JDWP_REQUEST_MODIFIER(SourceNameMatch): {
char* desiredNamePattern =
filter->u.SourceNameOnly.sourceNamePattern;
- if (!searchAllSourceNames(env, clazz,
- desiredNamePattern) == 1) {
+ if (!(searchAllSourceNames(env, clazz, desiredNamePattern) ==
1)) {
/* The name isn't in the SDE; try the sourceName in the ref
* type
*/
++++++ giflib.patch ++++++
--- jdk9/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gif.c
2015-05-22 13:45:18.116899500 +0200
+++ jdk9/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gif.c
2015-05-22 13:48:58.886861025 +0200
@@ -296,16 +296,22 @@
free(pBitmapBits);
free(pOldBitmapBits);
+#if GIFLIB_MAJOR > 5 || ( GIFLIB_MAJOR == 5 && GIFLIB_MINOR > 0)
DGifCloseFile(gif, NULL);
-
+#else
+ DGifCloseFile(gif);
+#endif
return 1;
}
int
SplashDecodeGifStream(Splash * splash, SplashStream * stream)
{
+#if GIFLIB_MAJOR >= 5
GifFileType *gif = DGifOpen((void *) stream, SplashStreamGifInputFunc,
NULL);
-
+#else
+ GifFileType *gif = DGifOpen((void *) stream, SplashStreamGifInputFunc);
+#endif
if (!gif)
return 0;
return SplashDecodeGif(splash, gif);
++++++ s390-size_t.patch ++++++
--- /var/tmp/diff_new_pack.rbUjuB/_old 2015-06-02 10:07:41.000000000 +0200
+++ /var/tmp/diff_new_pack.rbUjuB/_new 2015-06-02 10:07:41.000000000 +0200
@@ -1,5 +1,5 @@
---- jdk9/hotspot/src/share/vm/code/codeCache.cpp 2015-03-29
16:10:46.649313752 +0200
-+++ jdk9/hotspot/src/share/vm/code/codeCache.cpp 2015-03-29
16:15:27.153543255 +0200
+--- 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 @@
_heaps->append(heap);
@@ -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-03-29 16:10:46.651313631 +0200
-+++
jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
2015-03-29 16:15:27.154543216 +0200
-@@ -2645,7 +2645,7 @@
+---
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 @@
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-03-29 16:10:46.651313631 +0200
-+++
jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
2015-03-29 16:15:27.156543137 +0200
-@@ -853,7 +853,7 @@
+---
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 @@
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: ");
-@@ -5809,7 +5809,7 @@
+@@ -5743,7 +5743,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() &&
-@@ -6093,7 +6093,7 @@
+@@ -6027,7 +6027,7 @@
return;
}
// Double capacity if possible
@@ -49,9 +49,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(
---- jdk9/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
2015-03-29 16:10:46.654313449 +0200
-+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
2015-03-29 16:15:27.157543098 +0200
-@@ -3796,7 +3796,7 @@
+--- 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 @@
// of things to do) or totally (at the very end).
size_t target_size;
if (partially) {
@@ -60,9 +60,9 @@
} else {
target_size = 0;
}
---- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
2015-03-29 16:10:46.655313388 +0200
-+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
2015-03-29 16:15:27.158543058 +0200
-@@ -1650,7 +1650,7 @@
+--- 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 @@
verify_region_sets_optional();
@@ -71,9 +71,20 @@
ergo_verbose1(ErgoHeapSizing,
"attempt heap expansion",
ergo_format_reason("allocation request failed")
---- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
2015-03-29 16:10:46.656313327 +0200
-+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
2015-03-29 16:15:27.158543058 +0200
-@@ -41,7 +41,7 @@
+--- 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
+@@ -89,7 +89,7 @@
+ void pretouch_internal(size_t start_page, size_t end_page);
+
+ // Returns the index of the page which contains the given address.
+- uintptr_t addr_to_page_index(char* addr) const;
++ size_t addr_to_page_index(char* addr) const;
+ // 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) {
@@ -82,9 +93,9 @@
_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-03-29 16:10:46.656313327 +0200
-+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
2015-03-29 16:15:27.159543019 +0200
-@@ -111,7 +111,7 @@
+--- 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() {
@@ -93,20 +104,9 @@
_lists = PaddedArray<G1StringDedupEntryFreeList,
mtGC>::create_unfreeable((uint)_nlists);
}
---- jdk9/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
2015-03-29 16:10:46.656313327 +0200
-+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
2015-03-29 16:15:27.159543019 +0200
-@@ -110,7 +110,7 @@
- if (FLAG_IS_DEFAULT(G1HeapRegionSize)) {
- size_t average_heap_size = (initial_heap_size + max_heap_size) / 2;
- 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);
----
jdk9/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
2015-03-29 16:10:46.659313145 +0200
-+++
jdk9/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
2015-03-29 16:15:27.160542979 +0200
-@@ -912,8 +912,8 @@
+---
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 @@
void PSParallelCompact::initialize_dead_wood_limiter()
{
const size_t max = 100;
@@ -117,9 +117,9 @@
_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-03-29 16:10:46.657313267 +0200
-+++ jdk9/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
2015-03-29 16:15:27.160542979 +0200
-@@ -194,7 +194,7 @@
+--- 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,
@@ -128,18 +128,9 @@
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-03-29
16:10:46.663312903 +0200
-+++ jdk9/hotspot/src/share/vm/memory/collectorPolicy.cpp 2015-03-29
16:15:27.160542979 +0200
-@@ -383,7 +383,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);
-- FLAG_SET_ERGO(uintx, NewSize, MAX2(young_gen_size_lower_bound(),
smaller_new_size));
-+ FLAG_SET_ERGO(uintx, NewSize, MAX2(young_gen_size_lower_bound(),
(size_t)smaller_new_size));
- _initial_young_size = NewSize;
-
- // OldSize is already aligned because above we aligned MaxHeapSize to
-@@ -448,7 +448,7 @@
+--- 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
+@@ -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
// NewSize and MaxNewSize.
@@ -148,7 +139,7 @@
}
// Given the maximum young size, determine the initial and
-@@ -478,7 +478,7 @@
+@@ -479,7 +479,7 @@
// NewSize as the floor, because if NewRatio is overly large, the
resulting
// size can be too small.
_initial_young_size =
@@ -157,9 +148,9 @@
}
}
---- jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2015-03-29
16:10:46.665312782 +0200
-+++ jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2015-03-29
16:15:27.161542940 +0200
-@@ -1458,7 +1458,7 @@
+--- 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 @@
void MetaspaceGC::post_initialize() {
// Reset the high-water mark once the VM initialization is done.
@@ -168,7 +159,7 @@
}
bool MetaspaceGC::can_expand(size_t word_size, bool is_class) {
-@@ -1518,7 +1518,7 @@
+@@ -1513,7 +1513,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,
@@ -177,7 +168,7 @@
if (PrintGCDetails && Verbose) {
gclog_or_tty->print_cr("\nMetaspaceGC::compute_new_size: ");
-@@ -1577,7 +1577,7 @@
+@@ -1572,7 +1572,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,
@@ -186,7 +177,7 @@
if (PrintGCDetails && Verbose) {
gclog_or_tty->print_cr(" "
" maximum_free_percentage: %6.2f"
-@@ -3314,7 +3314,7 @@
+@@ -3309,7 +3309,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,
@@ -195,29 +186,9 @@
_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/oops/objArrayKlass.inline.hpp 2015-03-29
16:10:46.668312600 +0200
-+++ jdk9/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2015-03-29
16:15:27.162542900 +0200
-@@ -48,7 +48,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;
-@@ -82,7 +82,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/prims/whitebox.cpp 2015-03-29
16:10:46.678311993 +0200
-+++ jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2015-03-29
16:15:27.162542900 +0200
-@@ -724,7 +724,7 @@
+--- 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
+@@ -738,7 +738,7 @@
WB_END
WB_ENTRY(jobject, WB_GetSizeTVMFlag(JNIEnv* env, jobject o, jstring name))
@@ -226,9 +197,9 @@
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-03-29
16:10:46.678311993 +0200
-+++ jdk9/hotspot/src/share/vm/runtime/arguments.cpp 2015-03-29
17:49:57.971094740 +0200
-@@ -1163,7 +1163,7 @@
+--- 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
+@@ -1118,7 +1118,7 @@
// Increase the code cache size - tiered compiles a lot more.
if (FLAG_IS_DEFAULT(ReservedCodeCacheSize)) {
FLAG_SET_ERGO(uintx, ReservedCodeCacheSize,
@@ -237,32 +208,14 @@
}
// Enable SegmentedCodeCache if TieredCompilation is enabled and
ReservedCodeCacheSize >= 240M
if (FLAG_IS_DEFAULT(SegmentedCodeCache) && ReservedCodeCacheSize >= 240*M) {
-@@ -1341,7 +1341,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
-- FLAG_SET_ERGO(uintx, MaxNewSize, MAX2(NewSize, preferred_max_new_size));
-+ FLAG_SET_ERGO(uintx, MaxNewSize, MAX2((size_t)NewSize,
preferred_max_new_size));
- } else {
- FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size);
- }
-@@ -1366,8 +1366,8 @@
- // Unless explicitly requested otherwise, make young gen
- // at least min_new, and at most preferred_max_new_size.
- if (FLAG_IS_DEFAULT(NewSize)) {
-- FLAG_SET_ERGO(uintx, NewSize, MAX2(NewSize, min_new));
-- FLAG_SET_ERGO(uintx, NewSize, MIN2(preferred_max_new_size, NewSize));
-+ FLAG_SET_ERGO(uintx, NewSize, MAX2((size_t)NewSize, min_new));
-+ FLAG_SET_ERGO(uintx, NewSize, MIN2(preferred_max_new_size,
(size_t)NewSize));
- if (PrintGCDetails && Verbose) {
- // Too early to use gclog_or_tty
- tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize);
-@@ -1377,7 +1377,7 @@
- // so it's NewRatio x of NewSize.
- if (FLAG_IS_DEFAULT(OldSize)) {
- if (max_heap > NewSize) {
-- FLAG_SET_ERGO(uintx, OldSize, MIN2(NewRatio*NewSize, max_heap -
NewSize));
-+ FLAG_SET_ERGO(uintx, OldSize, MIN2((unsigned
long)(NewRatio*NewSize), max_heap - NewSize));
- if (PrintGCDetails && Verbose) {
- // Too early to use gclog_or_tty
- tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);
+--- 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
+@@ -283,7 +283,7 @@
+ // Value of the conservative maximum heap alignment needed
+ static size_t _conservative_max_heap_alignment;
+
+- static uintx _min_heap_size;
++ static size_t _min_heap_size;
+
+ // Used to store original flag values
+ static uintx _min_heap_free_ratio;
