/hg/release/icedtea6-1.9: Fix build failure on s390.

[doko at icedtea.classpath.org]

changeset 397ea53cdc7c in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=397ea53cdc7c
author: doko at ubuntu.com
date: Fri Sep 10 14:21:17 2010 +0200

	Fix build failure on s390.

	2010-09-10 Matthias Klose <doko at ubuntu.com>

	 * patches/params-cast-size_t.patch: Update, fix build
	failure on s390.


diffstat:

2 files changed, 26 insertions(+)
ChangeLog                        |    4 ++++
patches/params-cast-size_t.patch |   22 ++++++++++++++++++++++

diffs (40 lines):

diff -r 358b64f8f0bf -r 397ea53cdc7c ChangeLog
--- a/ChangeLog	Wed Sep 08 13:35:51 2010 +0100
+++ b/ChangeLog	Fri Sep 10 14:21:17 2010 +0200
@@ -1,3 +1,7 @@ 2010-09-08  Andrew John Hughes  <ahughes
+2010-09-10  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/params-cast-size_t.patch: Update, fix build failure on s390.
+
 2010-09-08  Andrew John Hughes  <ahughes at redhat.com>
 
 	* configure.ac: Bump to 1.9.1pre.
diff -r 358b64f8f0bf -r 397ea53cdc7c patches/params-cast-size_t.patch
--- a/patches/params-cast-size_t.patch	Wed Sep 08 13:35:51 2010 +0100
+++ b/patches/params-cast-size_t.patch	Fri Sep 10 14:21:17 2010 +0200
@@ -250,3 +250,25 @@ diff -Nru openjdk.orig/hotspot/src/share
            if (PrintGCDetails && Verbose) {
              // Too early to use gclog_or_tty
              tty->print_cr("Ergo set OldSize: " SIZE_FORMAT, OldSize);
+--- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.orig	2010-06-21 23:12:18.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	2010-09-09 10:48:01.909691035 +0200
+@@ -2882,7 +2882,7 @@
+   if (ResizeOldPLAB && CMSOldPLABResizeQuicker) {
+     size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks);
+     n_blks +=  CMSOldPLABReactivityFactor*multiple*n_blks;
+-    n_blks = MIN2(n_blks, CMSOldPLABMax);
++    n_blks = MIN2(n_blks, (size_t)CMSOldPLABMax);
+   }
+   assert(n_blks > 0, "Error");
+   _cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl);
+--- openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.orig	2010-06-21 21:12:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	2010-09-09 12:55:45.000000000 +0000
+@@ -160,7 +160,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.