[patch] fix build failure on s390

[Dr Andrew John Hughes]

On 11:43 Fri 10 Sep     , Matthias Klose wrote:
> this needs to go to 6 and 6-1.9.
> 
>    Matthias
> 

Approved for 6 and the 1.9 branch.
Is it not applicable to 1.7 and 1.8?

Was the original size_t patch needed for s390 too?

> 2010-09-10  Matthias Klose  <doko at ubuntu.com>
> 
> 	* patches/params-cast-size_t.patch: Update, fix build failure on s390.
> 
> diff -r e8452eabe369 patches/params-cast-size_t.patch
> --- a/patches/params-cast-size_t.patch	Wed Sep 08 13:16:22 2010 +0100
> +++ b/patches/params-cast-size_t.patch	Fri Sep 10 11:38:47 2010 +0200
> @@ -250,3 +250,25 @@
>             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.


Thanks,
-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8