# HG changeset patch
# User ohair
# Date 1218064095 25200
# Node ID 455092274fd16e17ab913258cf1c15b2d0b6fb25
# Parent  c590b856cfe2b2bfe04b9d0c2c5ee91c658bd903
6724669: JDK7: Official change to Sun Studio 12 compilers on Solaris
Reviewed-by: tbell

diff -r c590b856cfe2 -r 455092274fd1 corba/make/common/shared/Compiler-sun.gmk
--- a/corba/make/common/shared/Compiler-sun.gmk	Wed Aug 06 14:30:28 2008 -0700
+++ b/corba/make/common/shared/Compiler-sun.gmk	Wed Aug 06 16:08:15 2008 -0700
@@ -31,11 +31,8 @@
 
 # Sun Studio Compiler settings specific to Solaris
 ifeq ($(PLATFORM), solaris)
-  # FIXUP: Change to SS12 when validated
-  #COMPILER_VERSION=SS12
-  #REQUIRED_CC_VER=5.9
-  COMPILER_VERSION=SS11
-  REQUIRED_CC_VER=5.8
+  COMPILER_VERSION=SS12
+  REQUIRED_CC_VER=5.9
   CC             = $(COMPILER_PATH)cc
   CPP            = $(COMPILER_PATH)cc -E
   CXX            = $(COMPILER_PATH)CC
diff -r c590b856cfe2 -r 455092274fd1 corba/make/jprt.config
--- a/corba/make/jprt.config	Wed Aug 06 14:30:28 2008 -0700
+++ b/corba/make/jprt.config	Wed Aug 06 16:08:15 2008 -0700
@@ -127,9 +127,7 @@
     if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then
         compiler_name=${JPRT_SOLARIS_COMPILER_NAME}
     else
-        # FIXUP: Change to SS12 when validated
-	#compiler_name=SS12
-        compiler_name=SS11
+	compiler_name=SS12
     fi
     compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin
     ALT_COMPILER_PATH="${compiler_path}"