Mercurial > hg > release > icedtea6-1.9
changeset 2276:4b9b1ece4ede
RH647737: Disable compressed oops in hs19 to avoid Eclipse failures.
2010-11-10 Andrew John Hughes <ahughes@redhat.com>
RH647737
Disable compressed oops in hs19.
* Makefile.am: Add new patch.
* patches/disable-default-compoops.patch:
New patch to turn off compressed oops by default.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 10 Nov 2010 16:05:51 +0000 |
| parents | aa23fe60637f |
| children | 41d310123556 |
| files | ChangeLog Makefile.am patches/disable-default-compoops.patch |
| diffstat | 3 files changed, 22 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Nov 10 19:19:50 2010 +0000 +++ b/ChangeLog Wed Nov 10 16:05:51 2010 +0000 @@ -1,3 +1,11 @@ +2010-11-10 Andrew John Hughes <ahughes@redhat.com> + + RH647737 + Disable compressed oops in hs19. + * Makefile.am: Add new patch. + * patches/disable-default-compoops.patch: + New patch to turn off compressed oops by default. + 2010-10-22 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Add new patch for hs19
--- a/Makefile.am Wed Nov 10 19:19:50 2010 +0000 +++ b/Makefile.am Wed Nov 10 16:05:51 2010 +0000 @@ -319,7 +319,8 @@ if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ - patches/openjdk/6994130-ppc_fix.patch + patches/openjdk/6994130-ppc_fix.patch \ + patches/disable-default-compoops.patch else ICEDTEA_PATCHES += \ patches/shark_do_nothing_on_stub_frame.patch \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/disable-default-compoops.patch Wed Nov 10 16:05:51 2010 +0000 @@ -0,0 +1,12 @@ +--- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp 2010-11-08 23:50:59.000000000 -0500 ++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2010-11-08 23:52:53.000000000 -0500 +@@ -1301,7 +1301,8 @@ void Arguments::set_ergonomics_flags() { + if (MaxHeapSize <= max_heap_for_compressed_oops()) { + #ifndef COMPILER1 + if (FLAG_IS_DEFAULT(UseCompressedOops) && !UseG1GC) { +- FLAG_SET_ERGO(bool, UseCompressedOops, true); ++ // Temporarily fix rhbz#647737 -- disable compressed oops by default ++ //FLAG_SET_ERGO(bool, UseCompressedOops, true); + } + #endif + #ifdef _WIN64