Merge jdk7-b34

Thu, 14 Aug 2008 22:14:08 -0700

author
tbell
date
Thu, 14 Aug 2008 22:14:08 -0700
changeset 24
0a812b9824e5
parent 23
e0e03ab25da0
parent 22
05bf6aacc874
child 25
3867c4d14a5b
child 27
0d92f2ecc8ff

Merge

     1.1 --- a/.hgtags	Thu Aug 07 18:00:57 2008 -0700
     1.2 +++ b/.hgtags	Thu Aug 14 22:14:08 2008 -0700
     1.3 @@ -7,3 +7,4 @@
     1.4  c0252adbb2abbfdd6c35595429ac6fbdd98e20ac jdk7-b30
     1.5  ef6af34d75a7b44e77083f1d4ee47631fa09d3b4 jdk7-b31
     1.6  80a0f46a6203e727012bd579fe38a609b83decce jdk7-b32
     1.7 +6a5b9d2f8b20de54e3bfe33cd12bd0793caedc4e jdk7-b33
     2.1 --- a/make/common/shared/Compiler-sun.gmk	Thu Aug 07 18:00:57 2008 -0700
     2.2 +++ b/make/common/shared/Compiler-sun.gmk	Thu Aug 14 22:14:08 2008 -0700
     2.3 @@ -31,11 +31,8 @@
     2.4  
     2.5  # Sun Studio Compiler settings specific to Solaris
     2.6  ifeq ($(PLATFORM), solaris)
     2.7 -  # FIXUP: Change to SS12 when validated
     2.8 -  #COMPILER_VERSION=SS12
     2.9 -  #REQUIRED_CC_VER=5.9
    2.10 -  COMPILER_VERSION=SS11
    2.11 -  REQUIRED_CC_VER=5.8
    2.12 +  COMPILER_VERSION=SS12
    2.13 +  REQUIRED_CC_VER=5.9
    2.14    CC             = $(COMPILER_PATH)cc
    2.15    CPP            = $(COMPILER_PATH)cc -E
    2.16    CXX            = $(COMPILER_PATH)CC
     3.1 --- a/make/jprt.config	Thu Aug 07 18:00:57 2008 -0700
     3.2 +++ b/make/jprt.config	Thu Aug 14 22:14:08 2008 -0700
     3.3 @@ -127,9 +127,7 @@
     3.4      if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then
     3.5          compiler_name=${JPRT_SOLARIS_COMPILER_NAME}
     3.6      else
     3.7 -        # FIXUP: Change to SS12 when validated
     3.8 -	#compiler_name=SS12
     3.9 -        compiler_name=SS11
    3.10 +	compiler_name=SS12
    3.11      fi
    3.12      compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin
    3.13      ALT_COMPILER_PATH="${compiler_path}"

mercurial