Mercurial > hg > release > icedtea6-1.4
changeset 991:114ee2acf9c0
2008-07-26 Matthias Klose <doko@ubuntu.com>
* patches/icedtea-hotspot-citypeflow.patch: New.
* Makefile.am (ICEDTEA_PATCHES): Add patch.
* HACKING: Document.
author | doko@ubuntu.com |
---|---|
date | Sat, 26 Jul 2008 21:24:50 +0200 |
parents | 961aec1bb31b |
children | fc301971ab46 |
files | ChangeLog HACKING Makefile.am patches/icedtea-hotspot-citypeflow.patch |
diffstat | 4 files changed, 22 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jul 26 21:20:29 2008 +0200 +++ b/ChangeLog Sat Jul 26 21:24:50 2008 +0200 @@ -1,3 +1,9 @@ +2008-07-26 Matthias Klose <doko@ubuntu.com> + + * patches/icedtea-hotspot-citypeflow.patch: New. + * Makefile.am (ICEDTEA_PATCHES): Add patch. + * HACKING: Document. + 2008-07-26 Matthias Klose <doko@ubuntu.com> * patches/icedtea-arm-uname.patch: Rename to ...
--- a/HACKING Sat Jul 26 21:20:29 2008 +0200 +++ b/HACKING Sat Jul 26 21:24:50 2008 +0200 @@ -15,7 +15,7 @@ The following patches are currently applied before the building of OpenJDK or OpenJDK6 by IcedTea: * icedtea-ant.patch: Remove use of $(ANT_HOME). -* icedtea-arm-uname.patch: Handle output of uname on arm. +* icedtea-uname.patch: Handle output of uname on arm and mips{,el}. * icedtea-bytebuffer-compact.patch: Add clearMark() method to java.nio.Buffer (PR60). * icedtea-color-createcontext.patch: Add support for a PaintContext to java.awt.Color. * icedtea-copy-plugs.patch: Add IcedTea's 'plugs' for Java WebStart support, add @@ -61,6 +61,9 @@ * icedtea-zero-build.patch: Add support for the zero assembler build. * icedtea-shark-build.patch: Add support for building the Shark JIT. * icedtea-hotspot-gcc-pr36917.patch: Work around miscompilation with GCC 4.3 (PR 36917). +* icedtea-hotspot-citypeflow.patch: Fix hotspot miscompilation with GCC 4.3 on x86. +* icedtea-alpha-fixes.patch: Fix build issues on alpha-linux. +* The following patches are only applied to OpenJDK6 in IcedTea6:
--- a/Makefile.am Sat Jul 26 21:20:29 2008 +0200 +++ b/Makefile.am Sat Jul 26 21:24:50 2008 +0200 @@ -417,6 +417,7 @@ patches/icedtea-nomotif-6706121.patch \ patches/icedtea-nomotif.patch \ patches/icedtea-hotspot-gcc-pr36917.patch \ + patches/icedtea-hotspot-citypeflow.patch \ patches/icedtea-alpha-fixes.patch \ $(SHARK_PATCH) \ $(GCC_PATCH)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-hotspot-citypeflow.patch Sat Jul 26 21:24:50 2008 +0200 @@ -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