Mercurial > hg > release > icedtea6-1.4.1
changeset 1014:288bdc0696ff
* patches/icedtea-signed-types-hot6.patch: New patch.
* Makefile.am (NON_ZERO_PATCHES): Add icedtea-signed-types-hot6.patch.
| author | Mark Wielaard <mark@klomp.org> |
|---|---|
| date | Thu, 14 Aug 2008 16:54:46 +0200 |
| parents | a469b20018d9 |
| children | 626751ee178e |
| files | ChangeLog Makefile.am patches/icedtea-signed-types-hot6.patch |
| diffstat | 3 files changed, 28 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Aug 13 15:46:18 2008 +0100 +++ b/ChangeLog Thu Aug 14 16:54:46 2008 +0200 @@ -1,3 +1,8 @@ +2008-08-14 Mark Wielaard <mark@klomp.org> + + * patches/icedtea-signed-types-hot6.patch: New patch. + * Makefile.am (NON_ZERO_PATCHES): Add icedtea-signed-types-hot6.patch. + 2008-08-13 Gary Benson <gbenson@redhat.com> * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp
--- a/Makefile.am Wed Aug 13 15:46:18 2008 +0100 +++ b/Makefile.am Thu Aug 14 16:54:46 2008 +0200 @@ -426,7 +426,7 @@ patches/icedtea-ia64-bugfix.patch # Patches needed when not using the newer OpenJDK 7 HotSpot for zero. -NON_ZERO_PATCHES = +NON_ZERO_PATCHES = patches/icedtea-signed-types-hot6.patch if ZERO_BUILD ZERO_PATCHES_COND = $(ZERO_PATCHES)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-signed-types-hot6.patch Thu Aug 14 16:54:46 2008 +0200 @@ -0,0 +1,22 @@ +--- openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp.orig 2008-08-14 16:24:58.000000000 +0200 ++++ openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp 2008-08-14 16:25:20.000000000 +0200 +@@ -84,7 +84,7 @@ + address _locs_point; // last relocated position (grows upward) + bool _locs_own; // did I allocate the locs myself? + bool _frozen; // no more expansion of this section +- char _index; // my section number (SECT_INST, etc.) ++ signed char _index; // my section number (SECT_INST, etc.) + CodeBuffer* _outer; // enclosing CodeBuffer + + // (Note: _locs_point used to be called _last_reloc_offset.) +--- openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp.orig 2008-08-14 16:21:47.000000000 +0200 ++++ openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp 2008-08-14 16:25:51.000000000 +0200 +@@ -391,7 +391,7 @@ + // Set the rest of the locals to bottom. + Cell cell = state->next_cell(state->tos()); + state->set_stack_size(0); +- int limit = state->limit_cell(); ++ Cell limit = state->limit_cell(); + for (; cell < limit; cell = state->next_cell(cell)) { + state->set_type_at(cell, state->bottom_type()); + }