stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8023611: Win32 and win64: Remove all the WARNINGS in JDK 8 builds for Windows 2008 and MSVS 2010 SP1

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Tim Bell 2013-10-09 18:50:46 -07:00
parent 27cab0e0c8
commit 25f7d7b91b
3 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/make/common/shared/Compiler-msvc.gmk
View File

@ -53,7 +53,7 @@ ifndef CONFIGURE_BUILD
# The VS2010 compiler is the same one used on both 32bit and 64bit # The VS2010 compiler is the same one used on both 32bit and 64bit
ifeq ($(CC_MAJORVER), 16) ifeq ($(CC_MAJORVER), 16)
COMPILER_NAME=Microsoft Visual Studio 10 (16.00.30319.01) COMPILER_NAME=Microsoft Visual Studio 10 (16.00.40219.01)
COMPILER_VERSION=VS2010 COMPILER_VERSION=VS2010
ifeq ($(WINDOWSSDKDIR),) ifeq ($(WINDOWSSDKDIR),)
WINDOWSSDKDIR := $(error WINDOWSSDKDIR cannot be empty here) WINDOWSSDKDIR := $(error WINDOWSSDKDIR cannot be empty here)

22
jdk/make/common/shared/Defs-versions.gmk
View File

@ -86,19 +86,17 @@ endif
# REQUIRED_MAKE_VER # REQUIRED_MAKE_VER
# The minimum version of GNU make. # The minimum version of GNU make.
# #
# REQUIRED_MKS_VER
# Windows only: If MKS used instead of CYGWIN, the minimum version of MKS.
#
# REQUIRED_OS_VARIANT_NAME # REQUIRED_OS_VARIANT_NAME
# The OS variation name required. # The OS variation name required.
# Solaris: Solaris or OpenSolaris # Solaris: Solaris or OpenSolaris
# Windows: Windows2000, WindowsXP, Windows2003, etc. # Windows: Windows2000, WindowsXP, Windows2003, Windows2008R2, etc.
# Linux: Fedora, RedHat, SuSE, Ubuntu, etc. # Linux: Fedora, RedHat, SuSE, Ubuntu, etc.
# #
# REQUIRED_OS_VARIANT_VERSION # REQUIRED_OS_VARIANT_VERSION
# The version number associated with the above OS variant name. # The version number associated with the above OS variant name.
# Solaris: output of uname -r # Solaris: output of uname -r
# Windows: 5.0 for Windows2000, 5.1 for WindowsXP, 5.2 for Windows2003, etc. # Windows: 5.0 for Windows2000, 5.1 for WindowsXP,
# 5.2 for Windows2003, 6.1 for Windows2008R2, etc.
# Linux: number for the variant, e.g. 9 for Fedora 9 # Linux: number for the variant, e.g. 9 for Fedora 9
# #
# REQUIRED_OS_VERSION # REQUIRED_OS_VERSION
@ -180,21 +178,15 @@ endif
# Windows specific # Windows specific
ifeq ($(PLATFORM), windows) ifeq ($(PLATFORM), windows)
REQUIRED_OS_NAME = Windows REQUIRED_OS_NAME = Windows
ifeq ($(ARCH_DATA_MODEL),64) REQUIRED_OS_VERSION = 6.1
REQUIRED_OS_VERSION = 5.2 REQUIRED_OS_VARIANT_NAME = Windows2008R2
REQUIRED_OS_VARIANT_NAME = Windows2003
else
REQUIRED_OS_VERSION = 5.1
REQUIRED_OS_VARIANT_NAME = WindowsXP
endif
REQUIRED_OS_VARIANT_VERSION = $(REQUIRED_OS_VERSION) REQUIRED_OS_VARIANT_VERSION = $(REQUIRED_OS_VERSION)
REQUIRED_CYGWIN_VER = 4.0 REQUIRED_CYGWIN_VER = 4.0
REQUIRED_MKS_VER = 6.1
ifeq ($(CC_VERSION),msvc) ifeq ($(CC_VERSION),msvc)
REQUIRED_COMPILER_NAME = Visual Studio 10 REQUIRED_COMPILER_NAME = Visual Studio 10
REQUIRED_COMPILER_VERSION = VS2010 REQUIRED_COMPILER_VERSION = VS2010
REQUIRED_CC_VER = 16.00.30319.01 REQUIRED_CC_VER = 16.00.40219.01
REQUIRED_LINK_VER = 10.00.30319.01 REQUIRED_LINK_VER = 10.00.40219.01
endif endif
ifeq ($(CC_VERSION),gcc) ifeq ($(CC_VERSION),gcc)
REQUIRED_CC_VER = 3.4.3 REQUIRED_CC_VER = 3.4.3

23
jdk/make/common/shared/Sanity.gmk
View File

@ -121,11 +121,13 @@ ifeq ($(PLATFORM), macosx)
endif endif
ifeq ($(PLATFORM), windows) ifeq ($(PLATFORM), windows)
# Windows 2000 is 5.0, Windows XP is 5.1, Windows 2003 is 5.2 # Windows 2000 is 5.0, Windows XP is 5.1,
# Windows 2003 is 5.2, Windows 7 and 2008R2 are 6.1
# Assume 5.0 (Windows 2000) if systeminfo does not help # Assume 5.0 (Windows 2000) if systeminfo does not help
WINDOWS_MAPPING-5.0 := Windows2000 WINDOWS_MAPPING-5.0 := Windows2000
WINDOWS_MAPPING-5.1 := WindowsXP WINDOWS_MAPPING-5.1 := WindowsXP
WINDOWS_MAPPING-5.2 := Windows2003 WINDOWS_MAPPING-5.2 := Windows2003
WINDOWS_MAPPING-6.1 := Windows2008R2
# What kind of system we are using (Variation is the common name) # What kind of system we are using (Variation is the common name)
_OS_VERSION := \ _OS_VERSION := \
$(shell systeminfo 2> $(DEV_NULL) | \ $(shell systeminfo 2> $(DEV_NULL) | \
@ -180,7 +182,6 @@ include $(JDK_MAKE_SHARED_DIR)/Sanity-Settings.gmk
sane-linux \ sane-linux \
sane-cygwin \ sane-cygwin \
sane-cygwin-shell \ sane-cygwin-shell \
sane-mks \
sane-arch_data_model \ sane-arch_data_model \
sane-os_patch_level \ sane-os_patch_level \
sane-classpath \ sane-classpath \
@ -317,7 +318,7 @@ ifndef OPENJDK
endif # OPENJDK endif # OPENJDK
ifeq ($(PLATFORM), windows) ifeq ($(PLATFORM), windows)
sane-os_version:: sane-cygwin sane-mks sane-cygwin-shell sane-os_version:: sane-cygwin sane-cygwin-shell
endif endif
###################################################### ######################################################
@ -386,22 +387,6 @@ sane-cygwin-shell:
endif endif
endif endif
######################################################
# Check the Windows mks version
######################################################
ifeq ($(PLATFORM), windows)
MKS_CHECK :=$(call CheckVersions,$(MKS_VER),$(REQUIRED_MKS_VER))
sane-mks:
ifdef USING_MKS
ifeq ($(MKS_CHECK),missing)
@$(call OfficialErrorMessage,MKS version,$(MKS_VER),$(REQUIRED_MKS_VER))
endif
ifeq ($(MKS_CHECK),older)
@$(call OfficialErrorMessage,MKS version,$(MKS_VER),$(REQUIRED_MKS_VER))
endif
endif
endif
###################################################### ######################################################
# Get list of installed patches (this file has a particular format) # Get list of installed patches (this file has a particular format)
###################################################### ######################################################