Mercurial > hg > icedtea9-forest > jdk
changeset 2829:c5f6cd3bd70b
6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches)
Reviewed-by: jcoomes
author | ohair |
---|---|
date | Wed, 08 Sep 2010 15:12:37 -0700 |
parents | df049d0b973f |
children | 8f5a6ea8c9e9 |
files | make/common/shared/Compiler-sun.gmk make/common/shared/Defs-versions.gmk |
diffstat | 2 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/shared/Compiler-sun.gmk Tue Sep 07 15:17:43 2010 -0700 +++ b/make/common/shared/Compiler-sun.gmk Wed Sep 08 15:12:37 2010 -0700 @@ -61,6 +61,7 @@ # Get compiler version _CC_VER :=$(shell $(CC) -V 2>&1 | $(HEAD) -n 1) CC_VER :=$(call GetVersion,"$(_CC_VER)") +CC_MINORVER :=$(call MinorVersion,$(CC_VER)) # Name of compilers being used COMPILER_VERSION-5.7 = SS10 @@ -69,8 +70,10 @@ COMPILER_NAME-5.8 = Sun Studio 11 COMPILER_VERSION-5.9 = SS12 COMPILER_NAME-5.9 = Sun Studio 12 -COMPILER_VERSION-5.10 = SS13 -COMPILER_NAME-5.10 = Sun Studio 13 +COMPILER_VERSION-5.10 = SS12u1 +COMPILER_NAME-5.10 = Sun Studio 12 Update 1 +COMPILER_VERSION-5.11 = OSS12u2 +COMPILER_NAME-5.11 = Oracle Solaris Studio 12 Update 2 COMPILER_VERSION = $(COMPILER_VERSION-$(CC_VER)) COMPILER_NAME = $(COMPILER_NAME-$(CC_VER)) @@ -112,8 +115,8 @@ XARCH_OPTION_OLD/64 += -xarch=amd64 LINT_XARCH_OPTION_OLD/64 += -Xarch=amd64 endif -# Pick the options we want based on the compiler being used. -ifeq ($(shell expr $(CC_VER) \>= 5.9), 1) +# Pick the options we want based on the compiler being used. (5.9 or newer) +ifeq ($(shell expr $(CC_MINORVER) \>= 9), 1) XARCH_OPTION/32 = $(XARCH_OPTION_NEW/32) XARCH_OPTION/64 = $(XARCH_OPTION_NEW/64) LINT_XARCH_OPTION/32 = $(LINT_XARCH_OPTION_NEW/32)
--- a/make/common/shared/Defs-versions.gmk Tue Sep 07 15:17:43 2010 -0700 +++ b/make/common/shared/Defs-versions.gmk Wed Sep 08 15:12:37 2010 -0700 @@ -120,10 +120,10 @@ else REQUIRED_FREE_SPACE = 1040000 endif - REQUIRED_COMPILER_NAME = Sun Studio 12 - REQUIRED_COMPILER_VERSION = SS12 + REQUIRED_COMPILER_NAME = Sun Studio 12 Update 1 + REQUIRED_COMPILER_VERSION = SS12u1 ifeq ($(CC_VERSION),sun) - REQUIRED_CC_VER = 5.9 + REQUIRED_CC_VER = 5.10 endif ifeq ($(CC_VERSION),gcc) REQUIRED_CC_VER = 3.4.3 @@ -145,7 +145,7 @@ REQUIRED_CC_VER = 4.3.0 endif ifeq ($(CC_VERSION),sun) - REQUIRED_CC_VER = 5.9 + REQUIRED_CC_VER = 5.10 endif endif