From 15e21882f04e240ad313add7ce814344bedf2144 Mon Sep 17 00:00:00 2001
From: ohair <unknown>
Date: Thu, 14 Aug 2008 11:18:53 -0700
Subject: [PATCH] 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

---
 make/jprt.config                       | 4 +---
 make/solaris/makefiles/sparcWorks.make | 7 ++-----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/make/jprt.config b/make/jprt.config
index dd9940763..02fdbc0c5 100644
--- a/make/jprt.config
+++ b/make/jprt.config
@@ -77,9 +77,7 @@ if [ "${osname}" = SunOS ] ; then
             # 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 --git a/make/solaris/makefiles/sparcWorks.make b/make/solaris/makefiles/sparcWorks.make
index 83ef29612..5bbe70f9f 100644
--- a/make/solaris/makefiles/sparcWorks.make
+++ b/make/solaris/makefiles/sparcWorks.make
@@ -51,12 +51,9 @@ ifeq ($(JDK_MINOR_VERSION),6)
   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
-- 
GitLab