Mercurial > hg > release > icedtea6-1.3
changeset 1079:fa94fa7ac782
2008-10-09 Gary Benson <gbenson@redhat.com>
Andrew Haley <aph@redhat.com>
* patches/icedtea-hotspot-citypeflow.patch: Reinstated.
* Makefile.am (ZERO_PATCHES): Apply the above for HotSpot 7 builds.
* ports/hotspot/build/linux/makefiles/shark.make:
Remove workaround for the above.
| author | Gary Benson <gbenson@redhat.com> |
|---|---|
| date | Thu, 09 Oct 2008 11:25:22 -0400 |
| parents | 6790b974078e |
| children | 8b85ec866923 |
| files | ChangeLog Makefile.am patches/icedtea-hotspot-citypeflow.patch ports/hotspot/build/linux/makefiles/shark.make |
| diffstat | 4 files changed, 22 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Oct 09 13:35:37 2008 +0200 +++ b/ChangeLog Thu Oct 09 11:25:22 2008 -0400 @@ -1,3 +1,12 @@ +2008-10-09 Gary Benson <gbenson@redhat.com> + Andrew Haley <aph@redhat.com> + + * patches/icedtea-hotspot-citypeflow.patch: Reinstated. + * Makefile.am (ZERO_PATCHES): Apply the above for HotSpot 7 builds. + + * ports/hotspot/build/linux/makefiles/shark.make: + Remove workaround for the above. + 2008-10-09 Matthias Klose <doko@ubuntu.com> * patches/icedtea-6open-6616825.patch: New.
--- a/Makefile.am Thu Oct 09 13:35:37 2008 +0200 +++ b/Makefile.am Thu Oct 09 11:25:22 2008 -0400 @@ -421,7 +421,8 @@ patches/icedtea-signed-types.patch \ patches/icedtea-test-atomic-operations.patch \ patches/icedtea-zero.patch \ - patches/icedtea-ia64-bugfix.patch + patches/icedtea-ia64-bugfix.patch \ + patches/icedtea-hotspot-citypeflow.patch # Patches needed when not using the newer OpenJDK 7 HotSpot for zero. NON_ZERO_PATCHES = \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-hotspot-citypeflow.patch Thu Oct 09 11:25:22 2008 -0400 @@ -0,0 +1,11 @@ +--- openjdk/hotspot/src/share/vm/ci/ciTypeFlow.hpp~ 2008-07-10 22:04:30.000000000 +0200 ++++ openjdk/hotspot/src/share/vm/ci/ciTypeFlow.hpp 2008-07-25 14:32:03.544802121 +0200 +@@ -130,7 +130,7 @@ + + // Used as a combined index for locals and temps + enum Cell { +- Cell_0 ++ Cell_0, Cell_max = UINT_MAX + }; + + // A StateVector summarizes the type information at some
--- a/ports/hotspot/build/linux/makefiles/shark.make Thu Oct 09 13:35:37 2008 +0200 +++ b/ports/hotspot/build/linux/makefiles/shark.make Thu Oct 09 11:25:22 2008 -0400 @@ -30,10 +30,3 @@ VM_SUBDIR = server CFLAGS += -DSHARK - -# Something in this file fails with GCC at higher optimization levels. -# The part of ciTypeFlow::StateVector::meet_exception() that fills in -# local variables stops part way through leaving the rest set to T_TOP -# (ie uninitialized). The VM then aborts with a ShouldNotReachHere() -# in SharkPHIState::initialize(). Observed with 4.3.2. -OPT_CFLAGS/ciTypeFlow.o = -O1