Mercurial > hg > release > icedtea6-1.9
changeset 2271:bb3389e47862
Additional S390 size_t fixes.
2010-11-03 Dan Hor?k <dhorak@redhat.com>
* patches/hotspot/hs19/params-cast-size_t.patch:
Add additional fixes for S390.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 03 Nov 2010 18:26:48 +0000 |
| parents | 5a6f16947db2 |
| children | bb3540c689ab |
| files | ChangeLog patches/hotspot/hs19/params-cast-size_t.patch |
| diffstat | 2 files changed, 25 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Nov 03 10:54:08 2010 +0000 +++ b/ChangeLog Wed Nov 03 18:26:48 2010 +0000 @@ -1,3 +1,8 @@ +2010-11-03 Dan Horák <dhorak@redhat.com> + + * patches/hotspot/hs19/params-cast-size_t.patch: + Add additional fixes for S390. + 2010-11-02 Andrew John Hughes <ahughes@redhat.com> * hotspot.map: Update md5sum for new
--- a/patches/hotspot/hs19/params-cast-size_t.patch Wed Nov 03 10:54:08 2010 +0000 +++ b/patches/hotspot/hs19/params-cast-size_t.patch Wed Nov 03 18:26:48 2010 +0000 @@ -262,3 +262,23 @@ if (PrintGCDetails && Verbose) { // Too early to use gclog_or_tty tty->print_cr("Ergo set OldSize: " SIZE_FORMAT, OldSize); +--- openjdk.orig/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2010-10-28 05:45:16.000000000 -0400 ++++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2010-10-28 05:46:22.000000000 -0400 +@@ -37,7 +37,7 @@ void objArrayKlass::objarray_follow_cont + 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; +@@ -71,7 +71,7 @@ void objArrayKlass::objarray_follow_cont + 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;