# HG changeset patch
# User ohair
# Date 1218737933 25200
# Node ID 4852f4a82e58d19de2328ae9fed07e40bb33fab4
# Parent  79276d1b7e502c0402f6bd69744b1e2e3f612ce3
6724668: Hotspot: Official change to Sun Studio 12 compilers on Solaris
Summary: Moving to SS12. Builds with SS11 still work, the compiler comes from your PATH when building hotspot.
Reviewed-by: tbell

diff -r 79276d1b7e50 -r 4852f4a82e58 make/jprt.config
--- a/make/jprt.config	Sun Aug 10 21:58:54 2008 -0700
+++ b/make/jprt.config	Thu Aug 14 11:18:53 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 79276d1b7e50 -r 4852f4a82e58 make/solaris/makefiles/sparcWorks.make
--- a/make/solaris/makefiles/sparcWorks.make	Sun Aug 10 21:58:54 2008 -0700
+++ b/make/solaris/makefiles/sparcWorks.make	Thu Aug 14 11:18:53 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