# HG changeset patch
# User swamyv
# Date 1218827141 25200
# Node ID 02bac3e9892a2632f3a5185242ca874c544d404c
# Parent  04e4dadeec8ad3a515be889312d33ff4fc1c0221# Parent  62dac36a7ebd69dcdb6f68a0afe764d518c588c0
Merge

diff -r 04e4dadeec8a -r 02bac3e9892a hotspot/make/jprt.config
--- a/hotspot/make/jprt.config	Tue Aug 12 12:44:22 2008 -0700
+++ b/hotspot/make/jprt.config	Fri Aug 15 12:05:41 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 04e4dadeec8a -r 02bac3e9892a hotspot/make/solaris/makefiles/sparcWorks.make
--- a/hotspot/make/solaris/makefiles/sparcWorks.make	Tue Aug 12 12:44:22 2008 -0700
+++ b/hotspot/make/solaris/makefiles/sparcWorks.make	Fri Aug 15 12:05:41 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 04e4dadeec8a -r 02bac3e9892a hotspot/src/share/vm/runtime/statSampler.cpp
--- a/hotspot/src/share/vm/runtime/statSampler.cpp	Tue Aug 12 12:44:22 2008 -0700
+++ b/hotspot/src/share/vm/runtime/statSampler.cpp	Fri Aug 15 12:05:41 2008 -0700
@@ -217,6 +217,7 @@
   "java.class.path",
   "java.endorsed.dirs",
   "java.ext.dirs",
+  "java.version",
   "java.home",
   NULL
 };