Mercurial > hg > release > icedtea6-1.9
changeset 2275:aa23fe60637f
Fix hs19 on ppc machines.
2010-10-22 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am: Add new patch for hs19
builds only.
* NEWS: Mention fix.
* patches/openjdk/6994130-ppc_fix.patch:
Fix build on PPC machines (thanks to Gary
Benson).
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 10 Nov 2010 19:19:50 +0000 |
| parents | 99255f8dcacd |
| children | 4b9b1ece4ede |
| files | ChangeLog Makefile.am NEWS patches/openjdk/6994130-ppc_fix.patch |
| diffstat | 4 files changed, 29 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Nov 10 19:17:09 2010 +0000 +++ b/ChangeLog Wed Nov 10 19:19:50 2010 +0000 @@ -1,3 +1,12 @@ +2010-10-22 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: Add new patch for hs19 + builds only. + * NEWS: Mention fix. + * patches/openjdk/6994130-ppc_fix.patch: + Fix build on PPC machines (thanks to Gary + Benson). + 2010-11-10 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Add BigDecimal/Integer performance
--- a/Makefile.am Wed Nov 10 19:17:09 2010 +0000 +++ b/Makefile.am Wed Nov 10 19:19:50 2010 +0000 @@ -317,7 +317,10 @@ patches/openjdk/6850606-bigdecimal_regression.patch \ patches/openjdk/6876282-bigdecimal_divide.patch -if !WITH_ALT_HSBUILD +if WITH_ALT_HSBUILD +ICEDTEA_PATCHES += \ + patches/openjdk/6994130-ppc_fix.patch +else ICEDTEA_PATCHES += \ patches/shark_do_nothing_on_stub_frame.patch \ patches/icedtea-shark-build-hotspot.patch \
--- a/NEWS Wed Nov 10 19:17:09 2010 +0000 +++ b/NEWS Wed Nov 10 19:19:50 2010 +0000 @@ -8,6 +8,11 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 1.9.2 (2010-11-XX): + +* Backports + - S6991430, PR579: Zero PowerPC fix. + New in release 1.9.1 (2010-10-13): * HotSpot 19 supported; use --with-hotspot-build=hs19 to enable.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6994130-ppc_fix.patch Wed Nov 10 19:19:50 2010 +0000 @@ -0,0 +1,11 @@ +--- openjdk.orig/hotspot/src/share/vm/runtime/frame.cpp 2010-10-22 10:56:58.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/runtime/frame.cpp 2010-10-22 10:56:58.000000000 +0100 +@@ -878,7 +878,7 @@ + + #endif /* CC_INTERP */ + +-#ifndef PPC ++#if !defined(PPC) || defined(ZERO) + if (m->is_native()) { + #ifdef CC_INTERP + f->do_oop((oop*)&istate->_oop_temp);