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

8203795: Change default compiler on Windows to VS2017

Browse Source 
Reviewed-by: ihse, prr
This commit is contained in:
Erik Joelsson 2018-05-25 20:47:20 +02:00
parent a2f8f825ff
commit 73c228a63a
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
make/autoconf/toolchain_windows.m4
View File

@ -25,7 +25,7 @@
################################################################################ ################################################################################
# The order of these defines the priority by which we try to find them. # The order of these defines the priority by which we try to find them.
VALID_VS_VERSIONS="2013 2012 2010 2015 2017" VALID_VS_VERSIONS="2017 2013 2015 2012 2010"
VS_DESCRIPTION_2010="Microsoft Visual Studio 2010" VS_DESCRIPTION_2010="Microsoft Visual Studio 2010"
VS_VERSION_INTERNAL_2010=100 VS_VERSION_INTERNAL_2010=100
@ -58,7 +58,7 @@ VS_SDK_INSTALLDIR_2013=
VS_VS_PLATFORM_NAME_2013="v120" VS_VS_PLATFORM_NAME_2013="v120"
VS_SDK_PLATFORM_NAME_2013= VS_SDK_PLATFORM_NAME_2013=
VS_DESCRIPTION_2015="Microsoft Visual Studio 2015 - CURRENTLY NOT WORKING" VS_DESCRIPTION_2015="Microsoft Visual Studio 2015"
VS_VERSION_INTERNAL_2015=140 VS_VERSION_INTERNAL_2015=140
VS_MSVCR_2015=vcruntime140.dll VS_MSVCR_2015=vcruntime140.dll
VS_MSVCP_2015=msvcp140.dll VS_MSVCP_2015=msvcp140.dll
@ -71,7 +71,7 @@ VS_SDK_PLATFORM_NAME_2015=
# explicitly specifying Windows Kit 8.1 to be used. # explicitly specifying Windows Kit 8.1 to be used.
VS_ENV_ARGS_2015="8.1" VS_ENV_ARGS_2015="8.1"
VS_DESCRIPTION_2017="Microsoft Visual Studio 2017 - CURRENTLY NOT WORKING" VS_DESCRIPTION_2017="Microsoft Visual Studio 2017"
VS_VERSION_INTERNAL_2017=141 VS_VERSION_INTERNAL_2017=141
VS_MSVCR_2017=vcruntime140.dll VS_MSVCR_2017=vcruntime140.dll
VS_MSVCP_2017=msvcp140.dll VS_MSVCP_2017=msvcp140.dll

2
make/conf/jib-profiles.js
View File

@ -823,7 +823,7 @@ var getJibProfilesDependencies = function (input, common) {
macosx_x64: "Xcode6.3-MacOSX10.9+1.0", macosx_x64: "Xcode6.3-MacOSX10.9+1.0",
solaris_x64: "SS12u4-Solaris11u1+1.0", solaris_x64: "SS12u4-Solaris11u1+1.0",
solaris_sparcv9: "SS12u4-Solaris11u1+1.1", solaris_sparcv9: "SS12u4-Solaris11u1+1.1",
windows_x64: "VS2013SP4+1.0", windows_x64: "VS2017-15.5.5+1.0",
linux_aarch64: (input.profile != null && input.profile.indexOf("arm64") >= 0 linux_aarch64: (input.profile != null && input.profile.indexOf("arm64") >= 0
? "gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux+1.0" ? "gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux+1.0"
: "gcc7.3.0-Fedora27+1.0"), : "gcc7.3.0-Fedora27+1.0"),

3
make/test/JtregNativeHotspot.gmk
View File

@ -850,6 +850,9 @@ BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exesigtest := -ljvm
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c
# Disable warning until JDK-8203802 is fixed
BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libtimers += -wd4477
else else
BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbootclssearch_agent += -lpthread BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbootclssearch_agent += -lpthread
BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsystemclssearch_agent += -lpthread BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsystemclssearch_agent += -lpthread