[java-1.6.0-openjdk/f14/master] - Temporarily resolve rhbz#647737: - Put hs19 back, but disable Compressed Oops

[Deepak Bhole]

commit 9ade35253968963154ee1cea5281fad03951ad96
Author: Deepak Bhole <dbhole at tocatta.(none)>
Date:   Tue Nov 9 00:02:41 2010 -0500

    - Temporarily resolve rhbz#647737:
      - Put hs19 back, but disable Compressed Oops

 java-1.6.0-openjdk-bz647737.patch |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/java-1.6.0-openjdk-bz647737.patch b/java-1.6.0-openjdk-bz647737.patch
new file mode 100644
index 0000000..4abddb7
--- /dev/null
+++ b/java-1.6.0-openjdk-bz647737.patch
@@ -0,0 +1,28 @@
+diff -up ./Makefile.am.nocoops ./Makefile.am
+--- ./Makefile.am.nocoops	2010-11-08 23:49:23.000000000 -0500
++++ ./Makefile.am	2010-11-08 23:54:04.000000000 -0500
+@@ -310,6 +310,7 @@ ICEDTEA_PATCHES = \
+ 	patches/icedtea-shark-build.patch \
+ 	patches/openjdk/6638712-wildcard_types.patch \
+ 	patches/openjdk/6650759-missing_inference.patch \
++	patches/disable-default-coops.patch \
+ 	patches/numa_on_early_glibc.patch
+ 
+ 
+diff -up ./patches/disable-default-coops.patch.nocoops ./patches/disable-default-coops.patch
+--- ./patches/disable-default-coops.patch.nocoops	2010-11-08 23:54:41.000000000 -0500
++++ ./patches/disable-default-coops.patch	2010-11-08 23:54:16.000000000 -0500
+@@ -0,0 +1,13 @@
++diff -up openjdk/hotspot/src/share/vm/runtime/arguments.cpp.sav openjdk/hotspot/src/share/vm/runtime/arguments.cpp
++--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp.sav	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