changeset 50857:737a17045ffe

8203795: Change default compiler on Windows to VS2017 Reviewed-by: ihse, prr
author erikj
date Fri, 25 May 2018 20:47:20 +0200
parents dd2867f9e671
children 33a890c972c3
files make/autoconf/toolchain_windows.m4 make/conf/jib-profiles.js make/test/JtregNativeHotspot.gmk
diffstat 3 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/make/autoconf/toolchain_windows.m4	Fri May 25 11:18:22 2018 -0700
+++ b/make/autoconf/toolchain_windows.m4	Fri May 25 20:47:20 2018 +0200
@@ -25,7 +25,7 @@
 
 ################################################################################
 # 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_VERSION_INTERNAL_2010=100
@@ -58,7 +58,7 @@
 VS_VS_PLATFORM_NAME_2013="v120"
 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_MSVCR_2015=vcruntime140.dll
 VS_MSVCP_2015=msvcp140.dll
@@ -71,7 +71,7 @@
 # explicitly specifying Windows Kit 8.1 to be used.
 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_MSVCR_2017=vcruntime140.dll
 VS_MSVCP_2017=msvcp140.dll
--- a/make/conf/jib-profiles.js	Fri May 25 11:18:22 2018 -0700
+++ b/make/conf/jib-profiles.js	Fri May 25 20:47:20 2018 +0200
@@ -823,7 +823,7 @@
         macosx_x64: "Xcode6.3-MacOSX10.9+1.0",
         solaris_x64: "SS12u4-Solaris11u1+1.0",
         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
                     ? "gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux+1.0"
                     : "gcc7.3.0-Fedora27+1.0"),
--- a/make/test/JtregNativeHotspot.gmk	Fri May 25 11:18:22 2018 -0700
+++ b/make/test/JtregNativeHotspot.gmk	Fri May 25 20:47:20 2018 +0200
@@ -850,6 +850,9 @@
 ifeq ($(OPENJDK_TARGET_OS), windows)
     BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
     BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c
+
+    # Disable warning until JDK-8203802 is fixed
+    BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libtimers += -wd4477
 else
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbootclssearch_agent += -lpthread
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsystemclssearch_agent += -lpthread