Mercurial > jdk8-mips64-public > corba / changeset
changeset
Merge
Wed, 12 May 2010 17:19:35 -0700
- author
- mikejwre
- date
- Wed, 12 May 2010 17:19:35 -0700
- changeset 151
- 9718d624864c
- parent 149
- ae18df0d4767
- parent 150
- ee2d8f1bef5b
- child 152
- f2ff4938cecd
Merge
1.1 --- a/make/common/Defs-windows.gmk Thu May 06 18:25:55 2010 -0700 1.2 +++ b/make/common/Defs-windows.gmk Wed May 12 17:19:35 2010 -0700 1.3 @@ -77,6 +77,11 @@ 1.4 MSVCPNN_DLL = msvcp90.dll 1.5 MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL) 1.6 endif 1.7 + ifeq ($(COMPILER_VERSION), VS2010) 1.8 + MSVCRNN_DLL = msvcr100.dll 1.9 + MSVCPNN_DLL = msvcp100.dll 1.10 + MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL) 1.11 + endif 1.12 endif 1.13 1.14 # C Compiler flag definitions 1.15 @@ -175,6 +180,20 @@ 1.16 CC_LOWER_OPT = -O1 1.17 endif 1.18 endif 1.19 + ifeq ($(COMPILER_VERSION), VS2010) 1.20 + # Automatic precompiled header option to use (if COMPILE_APPROACH=batch) 1.21 + AUTOMATIC_PCH_OPTION = 1.22 + GX_OPTION = -EHsc 1.23 + ifeq ($(ARCH_DATA_MODEL), 32) 1.24 + CC_HIGHEST_OPT = -O2 1.25 + CC_HIGHER_OPT = -O1 1.26 + CC_LOWER_OPT = -O1 1.27 + else 1.28 + CC_HIGHEST_OPT = -O2 1.29 + CC_HIGHER_OPT = -O1 1.30 + CC_LOWER_OPT = -O1 1.31 + endif 1.32 + endif 1.33 CC_NO_OPT = -Od 1.34 else # CC_VERSION 1.35 # GCC not supported, but left for historical reference...
2.1 --- a/make/common/shared/Compiler-msvc.gmk Thu May 06 18:25:55 2010 -0700 2.2 +++ b/make/common/shared/Compiler-msvc.gmk Wed May 12 17:19:35 2010 -0700 2.3 @@ -97,6 +97,19 @@ 2.4 COMPILER_PATH := $(error COMPILER_PATH cannot be empty here) 2.5 endif 2.6 endif 2.7 + ifeq ($(CC_MAJORVER), 16) 2.8 + # This should be: CC_VER=16.00.30319.01 LINK_VER=10.00.30319.01 2.9 + REQUIRED_CC_VER = 16.00.30319.01 2.10 + REQUIRED_LINK_VER = 10.00.30319.01 2.11 + COMPILER_NAME=Visual Studio 10 2.12 + COMPILER_VERSION=VS2010 2.13 + #rebase and midl moved out of Visual Studio into the SDK: 2.14 + REBASE = $(MSDEVTOOLS_PATH)/rebase 2.15 + MTL = $(MSDEVTOOLS_PATH)/midl.exe 2.16 + ifndef COMPILER_PATH 2.17 + COMPILER_PATH := $(error COMPILER_PATH cannot be empty here) 2.18 + endif 2.19 + endif 2.20 else 2.21 # else ARCH_DATA_MODEL is 64 2.22 ifndef LINK_VER 2.23 @@ -144,11 +157,21 @@ 2.24 COMPILER_NAME=Windows SDK 6.1 Visual Studio 9 2.25 COMPILER_VERSION=VS2008 2.26 RC = $(MSSDK61)/bin/x64/rc 2.27 - REBASE = $(MSSDK61/bin/x64/rebase 2.28 + REBASE = $(MSSDK61)/bin/x64/rebase 2.29 else 2.30 - # This will cause problems if ALT_COMPILER_PATH is defined to "" 2.31 - # which is a directive to use the PATH. 2.32 - REBASE = $(COMPILER_PATH)../REBASE 2.33 + ifeq ($(CC_MAJORVER), 16) 2.34 + # This should be: CC_VER=16.00.30319.01 LINK_VER=9.00.30319.01 2.35 + REQUIRED_CC_VER = 16.00.30319.01 2.36 + REQUIRED_LINK_VER = 10.00.30319.01 2.37 + COMPILER_NAME=Microsoft Visual Studio 10 2.38 + COMPILER_VERSION=VS2010 2.39 + RC = $(MSSDK7)/bin/x64/rc 2.40 + REBASE = $(MSSDK7)/bin/x64/rebase 2.41 + else 2.42 + # This will cause problems if ALT_COMPILER_PATH is defined to "" 2.43 + # which is a directive to use the PATH. 2.44 + REBASE = $(COMPILER_PATH)../REBASE 2.45 + endif 2.46 endif 2.47 ifndef COMPILER_PATH 2.48 COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
3.1 --- a/make/common/shared/Defs-windows.gmk Thu May 06 18:25:55 2010 -0700 3.2 +++ b/make/common/shared/Defs-windows.gmk Wed May 12 17:19:35 2010 -0700 3.3 @@ -222,6 +222,17 @@ 3.4 ifneq ($(subst MSDev98,OLDOLDOLD,$(SHORTMSVCDIR)),$(SHORTMSVCDIR)) 3.5 SHORTMSVCDIR := 3.6 endif 3.7 + # If we still don't have it, look for VS100COMNTOOLS, setup by installer? 3.8 + ifeq ($(SHORTMSVCDIR),) 3.9 + ifdef VS100COMNTOOLS # /Common/Tools directory, use ../../Vc 3.10 + xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))" 3.11 + _vs100tools :=$(call FullPath,$(xVS100COMNTOOLS)) 3.12 + endif 3.13 + ifneq ($(_vs100tools),) 3.14 + SHORTMSVCDIR :=$(_vs100tools)/../../Vc 3.15 + endif 3.16 + endif 3.17 + export SHORTMSVCDIR 3.18 # If we still don't have it, look for VS71COMNTOOLS, setup by installer? 3.19 ifeq ($(SHORTMSVCDIR),) 3.20 ifdef VS71COMNTOOLS # /Common/Tools directory, use ../../Vc7 3.21 @@ -272,24 +283,35 @@ 3.22 # Compilers for 64bit are from SDK 3.23 ifeq ($(ARCH_DATA_MODEL), 64) 3.24 ifndef SHORTCOMPILERBIN 3.25 - xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/" 3.26 - MSSDK61 :=$(call FullPath,$(xMSSDK61)) 3.27 - xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/" 3.28 - _vs2008 :=$(call FullPath,$(xVS2008)) 3.29 - ifneq ($(_vs2008),) 3.30 - ifeq ($(ARCH), ia64) 3.31 - SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/x86_ia64 3.32 - endif 3.33 - ifeq ($(ARCH), amd64) 3.34 - SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/$(ARCH) 3.35 - endif 3.36 + ifdef VS100COMNTOOLS # /Common7/Tools directory, use ../../Vc 3.37 + xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))" 3.38 + _vs100tools :=$(call FullPath,$(xVS100COMNTOOLS)) 3.39 + endif 3.40 + ifneq ($(_vs100tools),) 3.41 + SHORTCOMPILERBIN :=$(_vs100tools)/../../Vc/bin/amd64 3.42 + xMSSDK70 :="C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/" 3.43 + MSSDK7 :=$(call FullPath,$(xMSSDK70)) 3.44 + export MSSDK7 3.45 else 3.46 - ifneq ($(SHORTPSDK),) 3.47 + xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/" 3.48 + MSSDK61 :=$(call FullPath,$(xMSSDK61)) 3.49 + xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/" 3.50 + _vs2008 :=$(call FullPath,$(xVS2008)) 3.51 + ifneq ($(_vs2008),) 3.52 ifeq ($(ARCH), ia64) 3.53 - SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64 3.54 + SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/x86_ia64 3.55 endif 3.56 ifeq ($(ARCH), amd64) 3.57 - SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64/x86/$(ARCH) 3.58 + SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/$(ARCH) 3.59 + endif 3.60 + else 3.61 + ifneq ($(SHORTPSDK),) 3.62 + ifeq ($(ARCH), ia64) 3.63 + SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64 3.64 + endif 3.65 + ifeq ($(ARCH), amd64) 3.66 + SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64/x86/$(ARCH) 3.67 + endif 3.68 endif 3.69 endif 3.70 endif
4.1 --- a/make/common/shared/Platform.gmk Thu May 06 18:25:55 2010 -0700 4.2 +++ b/make/common/shared/Platform.gmk Wed May 12 17:19:35 2010 -0700 4.3 @@ -333,7 +333,11 @@ 4.4 endif 4.5 ARCH_FAMILY = $(ARCH) 4.6 # Where is unwanted output to be delivered? 4.7 - DEV_NULL = NUL 4.8 + ifeq ($(USING_CYGWIN),true) 4.9 + DEV_NULL = /dev/null 4.10 + else 4.11 + DEV_NULL = NUL 4.12 + endif 4.13 export DEV_NULL 4.14 # Classpath separator 4.15 CLASSPATH_SEPARATOR = ;
