# HG changeset patch
# User ysr
# Date 1219221032 25200
# Node ID 92e12124e774d574cf9a8ffab4213ada882488b8
# Parent  44aea0a1e099d032696ff78234ab59dbcb08cd3a# Parent  9199f248b0eebb11e4e3b1215f488dbfb96d90c1
Merge

diff -r 9199f248b0ee -r 92e12124e774 agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java	Thu Aug 14 17:58:35 2008 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java	Wed Aug 20 01:30:32 2008 -0700
@@ -193,8 +193,12 @@
 
    private static final double FACTOR = 1024*1024;
    private void printValMB(String title, long value) {
-      double mb = value / FACTOR;
-      System.out.println(alignment + title + value + " (" + mb + "MB)");
+      if (value < 0) {
+        System.out.println(alignment + title +   (value >>> 20)  + " MB");
+      } else {
+        double mb = value/FACTOR;
+        System.out.println(alignment + title + value + " (" + mb + "MB)");
+      }
    }
 
    private void printValue(String title, long value) {
diff -r 9199f248b0ee -r 92e12124e774 make/jprt.config
--- a/make/jprt.config	Thu Aug 14 17:58:35 2008 -0700
+++ b/make/jprt.config	Wed Aug 20 01:30:32 2008 -0700
@@ -77,9 +77,7 @@
             # All jdk6 builds use SS11
             compiler_name=SS11
         else
-            # FIXUP: Change to SS12 once it has been validated.
-	    #compiler_name=SS12
-            compiler_name=SS11
+	    compiler_name=SS12
         fi
     fi
     
diff -r 9199f248b0ee -r 92e12124e774 make/solaris/makefiles/sparcWorks.make
--- a/make/solaris/makefiles/sparcWorks.make	Thu Aug 14 17:58:35 2008 -0700
+++ b/make/solaris/makefiles/sparcWorks.make	Wed Aug 20 01:30:32 2008 -0700
@@ -51,12 +51,9 @@
   VALIDATED_COMPILER_REV   := 5.8
   VALIDATED_C_COMPILER_REV := 5.8
 else
-  # FIXUP: Change to SS12 (5.9) once it has been validated.
   # Validated compiler for JDK7 is SS12 (5.9)
-  #VALIDATED_COMPILER_REV   := 5.9
-  #VALIDATED_C_COMPILER_REV := 5.9
-  VALIDATED_COMPILER_REV   := 5.8
-  VALIDATED_C_COMPILER_REV := 5.8
+  VALIDATED_COMPILER_REV   := 5.9
+  VALIDATED_C_COMPILER_REV := 5.9
 endif
 
 # Warning messages about not using the above validated version
diff -r 9199f248b0ee -r 92e12124e774 src/share/vm/runtime/statSampler.cpp
--- a/src/share/vm/runtime/statSampler.cpp	Thu Aug 14 17:58:35 2008 -0700
+++ b/src/share/vm/runtime/statSampler.cpp	Wed Aug 20 01:30:32 2008 -0700
@@ -217,6 +217,7 @@
   "java.class.path",
   "java.endorsed.dirs",
   "java.ext.dirs",
+  "java.version",
   "java.home",
   NULL
 };