diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk
index 4467923a92e..2064a0394a6 100644
--- a/closed/OpenJ9.gmk
+++ b/closed/OpenJ9.gmk
@@ -143,6 +143,9 @@ else
   FEATURE_SED_SCRIPT += $(call SedDisable,opt_jitserver)
 endif
 
+# Disable windows rebase.
+SPEC_SED_SCRIPT += $(call SedDisable,uma_windowsRebase)
+
 # Adjust OpenJDK MethodHandles enablement flags.
 ifeq (true,$(OPENJ9_ENABLE_OPENJDK_METHODHANDLES))
   FEATURE_SED_SCRIPT += $(call SedEnable,opt_openjdkMethodhandle)
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 2d177ccd885..cb1c34688e8 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -4410,7 +4410,7 @@ VS_SDK_PLATFORM_NAME_2017=
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1600276123
+DATE_WHEN_GENERATED=1603757496
 
 ###############################################################################
 #
diff --git a/jdk/make/closed/autoconf/custom-hook.m4 b/jdk/make/closed/autoconf/custom-hook.m4
index 3321c45a881..df67c5952ca 100644
--- a/jdk/make/closed/autoconf/custom-hook.m4
+++ b/jdk/make/closed/autoconf/custom-hook.m4
@@ -474,10 +474,10 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_MSVCP_DLL],
   POSSIBLE_MSVCP_DLL="$1"
   METHOD="$2"
   if test -e "$POSSIBLE_MSVCP_DLL" ; then
-    AC_MSG_NOTICE([Found msvcp100.dll at $POSSIBLE_MSVCP_DLL using $METHOD])
+    AC_MSG_NOTICE([Found msvcp120.dll at $POSSIBLE_MSVCP_DLL using $METHOD])
 
     # Need to check if the found msvcp is correct architecture
-    AC_MSG_CHECKING([found msvcp100.dll architecture])
+    AC_MSG_CHECKING([found msvcp120.dll architecture])
     MSVCP_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCP_DLL"`
     if test "x$OPENJDK_TARGET_CPU_BITS" = x32 ; then
       CORRECT_MSVCP_ARCH=386
@@ -487,11 +487,11 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_MSVCP_DLL],
     if $ECHO "$MSVCP_DLL_FILETYPE" | $GREP $CORRECT_MSVCP_ARCH 2>&1 > /dev/null ; then
       AC_MSG_RESULT([ok])
       MSVCP_DLL="$POSSIBLE_MSVCP_DLL"
-      AC_MSG_CHECKING([for msvcp100.dll])
+      AC_MSG_CHECKING([for msvcp120.dll])
       AC_MSG_RESULT([$MSVCP_DLL])
     else
       AC_MSG_RESULT([incorrect, ignoring])
-      AC_MSG_NOTICE([The file type of the located msvcp100.dll is $MSVCP_DLL_FILETYPE])
+      AC_MSG_NOTICE([The file type of the located msvcp120.dll is $MSVCP_DLL_FILETYPE])
     fi
   fi
 ])
@@ -499,25 +499,25 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_MSVCP_DLL],
 AC_DEFUN([TOOLCHAIN_SETUP_MSVCP_DLL],
 [
   AC_ARG_WITH(msvcp-dll, [AS_HELP_STRING([--with-msvcp-dll],
-      [copy this msvcp100.dll into the built JDK (Windows only) @<:@probed@:>@])])
+      [copy this msvcp120.dll into the built JDK (Windows only) @<:@probed@:>@])])
 
   if test "x$with_msvcp_dll" != x ; then
     # If given explicitly by user, do not probe. If not present, fail directly.
     TOOLCHAIN_CHECK_POSSIBLE_MSVCP_DLL([$with_msvcp_dll], [--with-msvcp-dll])
     if test "x$MSVCP_DLL" = x ; then
-      AC_MSG_ERROR([Could not find a proper msvcp100.dll as specified by --with-msvcp-dll])
+      AC_MSG_ERROR([Could not find a proper msvcp120.dll as specified by --with-msvcp-dll])
     fi
   fi
 
   if test "x$MSVCP_DLL" = x ; then
-    # Probe: Using well-known location from Visual Studio 10.0
+    # Probe: Using well-known location from Visual Studio 12.0
     if test "x$VCINSTALLDIR" != x ; then
       CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
       BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VC_INSTALL_DIR)
       if test "x$OPENJDK_TARGET_CPU_BITS" = x64 ; then
-        POSSIBLE_MSVCP_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC100.CRT/msvcp100.dll"
+        POSSIBLE_MSVCP_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC120.CRT/msvcp120.dll"
       else
-        POSSIBLE_MSVCP_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC100.CRT/msvcp100.dll"
+        POSSIBLE_MSVCP_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC120.CRT/msvcp120.dll"
       fi
       TOOLCHAIN_CHECK_POSSIBLE_MSVCP_DLL([$POSSIBLE_MSVCP_DLL], [well-known location in VCINSTALLDIR])
     fi
@@ -525,7 +525,7 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVCP_DLL],
 
   if test "x$MSVCP_DLL" = x ; then
     # Probe: Check in the Boot JDK directory.
-    POSSIBLE_MSVCP_DLL="$BOOT_JDK/bin/msvcp100.dll"
+    POSSIBLE_MSVCP_DLL="$BOOT_JDK/bin/msvcp120.dll"
     TOOLCHAIN_CHECK_POSSIBLE_MSVCP_DLL([$POSSIBLE_MSVCP_DLL], [well-known location in Boot JDK])
   fi
 
@@ -533,21 +533,21 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVCP_DLL],
     # Probe: Look in the Windows system32 directory
     CYGWIN_SYSTEMROOT="$SYSTEMROOT"
     BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_SYSTEMROOT)
-    POSSIBLE_MSVCP_DLL="$CYGWIN_SYSTEMROOT/system32/msvcp100.dll"
+    POSSIBLE_MSVCP_DLL="$CYGWIN_SYSTEMROOT/system32/msvcp120.dll"
     TOOLCHAIN_CHECK_POSSIBLE_MSVCP_DLL([$POSSIBLE_MSVCP_DLL], [well-known location in SYSTEMROOT])
   fi
 
   if test "x$MSVCP_DLL" = x ; then
     # Probe: If Visual Studio Express is installed, there is usually one with the debugger
-    if test "x$VS100COMNTOOLS" != x ; then
-      CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
+    if test "x$VS120COMNTOOLS" != x ; then
+      CYGWIN_VS_TOOLS_DIR="$VS120COMNTOOLS/.."
       BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VS_TOOLS_DIR)
       if test "x$OPENJDK_TARGET_CPU_BITS" = x64 ; then
-        POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcp100.dll | $GREP -i /x64/ | $HEAD --lines 1`
+        POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcp120.dll | $GREP -i /x64/ | $HEAD --lines 1`
       else
-        POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcp100.dll | $GREP -i /x86/ | $HEAD --lines 1`
+        POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcp120.dll | $GREP -i /x86/ | $HEAD --lines 1`
       fi
-      TOOLCHAIN_CHECK_POSSIBLE_MSVCP_DLL([$POSSIBLE_MSVCP_DLL], [search of VS100COMNTOOLS])
+      TOOLCHAIN_CHECK_POSSIBLE_MSVCP_DLL([$POSSIBLE_MSVCP_DLL], [search of VS120COMNTOOLS])
     fi
   fi
 
@@ -556,12 +556,12 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVCP_DLL],
     # (This was the original behaviour ; kept since it might turn up something)
     if test "x$CYGWIN_VC_INSTALL_DIR" != x ; then
       if test "x$OPENJDK_TARGET_CPU_BITS" = x64 ; then
-        POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcp100.dll | $GREP x64 | $HEAD --lines 1`
+        POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcp120.dll | $GREP x64 | $HEAD --lines 1`
       else
-        POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcp100.dll | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
+        POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcp120.dll | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
         if test "x$POSSIBLE_MSVCP_DLL" = x ; then
           # We're grasping at straws now...
-          POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcp100.dll | $HEAD --lines 1`
+          POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcp120.dll | $HEAD --lines 1`
         fi
       fi
 
@@ -570,9 +570,9 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVCP_DLL],
   fi
 
   if test "x$MSVCP_DLL" = x ; then
-    AC_MSG_CHECKING([for msvcp100.dll])
+    AC_MSG_CHECKING([for msvcp120.dll])
     AC_MSG_RESULT([no])
-    AC_MSG_ERROR([Could not find msvcp100.dll. Please specify using --with-msvcp-dll.])
+    AC_MSG_ERROR([Could not find msvcp120.dll. Please specify using --with-msvcp-dll.])
   fi
 
   BASIC_FIXUP_PATH(MSVCP_DLL)
diff --git a/jdk/make/closed/autoconf/generated-configure.sh b/jdk/make/closed/autoconf/generated-configure.sh
index 9fbbb2dd083..7b0de4840fc 100644
--- a/jdk/make/closed/autoconf/generated-configure.sh
+++ b/jdk/make/closed/autoconf/generated-configure.sh
@@ -1963,7 +1963,7 @@ Optional Packages:
                           the version of the toolchain to look for, use
                           '--help' to show possible values [platform
                           dependent]
-  --with-msvcp-dll        copy this msvcp100.dll into the built JDK (Windows
+  --with-msvcp-dll        copy this msvcp120.dll into the built JDK (Windows
                           only) [probed]
   --with-freemarker-jar   path to freemarker.jar (used to build OpenJ9 build
                           tools)
@@ -4547,7 +4547,7 @@ VS_SDK_PLATFORM_NAME_2017=
 
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1600276123
+DATE_WHEN_GENERATED=1603757496
 
 ###############################################################################
 #
@@ -17232,12 +17232,12 @@ fi
   POSSIBLE_MSVCP_DLL="$with_msvcp_dll"
   METHOD="--with-msvcp-dll"
   if test -e "$POSSIBLE_MSVCP_DLL" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcp100.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&5
-$as_echo "$as_me: Found msvcp100.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcp120.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&5
+$as_echo "$as_me: Found msvcp120.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&6;}
 
     # Need to check if the found msvcp is correct architecture
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcp100.dll architecture" >&5
-$as_echo_n "checking found msvcp100.dll architecture... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcp120.dll architecture" >&5
+$as_echo_n "checking found msvcp120.dll architecture... " >&6; }
     MSVCP_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCP_DLL"`
     if test "x$OPENJDK_TARGET_CPU_BITS" = x32 ; then
       CORRECT_MSVCP_ARCH=386
@@ -17248,25 +17248,25 @@ $as_echo_n "checking found msvcp100.dll architecture... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
       MSVCP_DLL="$POSSIBLE_MSVCP_DLL"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcp100.dll" >&5
-$as_echo_n "checking for msvcp100.dll... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcp120.dll" >&5
+$as_echo_n "checking for msvcp120.dll... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCP_DLL" >&5
 $as_echo "$MSVCP_DLL" >&6; }
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
 $as_echo "incorrect, ignoring" >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETYPE" >&5
-$as_echo "$as_me: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETYPE" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcp120.dll is $MSVCP_DLL_FILETYPE" >&5
+$as_echo "$as_me: The file type of the located msvcp120.dll is $MSVCP_DLL_FILETYPE" >&6;}
     fi
   fi
 
     if test "x$MSVCP_DLL" = x ; then
-      as_fn_error $? "Could not find a proper msvcp100.dll as specified by --with-msvcp-dll" "$LINENO" 5
+      as_fn_error $? "Could not find a proper msvcp120.dll as specified by --with-msvcp-dll" "$LINENO" 5
     fi
   fi
 
   if test "x$MSVCP_DLL" = x ; then
-    # Probe: Using well-known location from Visual Studio 10.0
+    # Probe: Using well-known location from Visual Studio 12.0
     if test "x$VCINSTALLDIR" != x ; then
       CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
 
@@ -17280,20 +17280,20 @@ $as_echo "$as_me: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETY
   fi
 
       if test "x$OPENJDK_TARGET_CPU_BITS" = x64 ; then
-        POSSIBLE_MSVCP_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC100.CRT/msvcp100.dll"
+        POSSIBLE_MSVCP_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC120.CRT/msvcp120.dll"
       else
-        POSSIBLE_MSVCP_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC100.CRT/msvcp100.dll"
+        POSSIBLE_MSVCP_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC120.CRT/msvcp120.dll"
       fi
 
   POSSIBLE_MSVCP_DLL="$POSSIBLE_MSVCP_DLL"
   METHOD="well-known location in VCINSTALLDIR"
   if test -e "$POSSIBLE_MSVCP_DLL" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcp100.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&5
-$as_echo "$as_me: Found msvcp100.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcp120.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&5
+$as_echo "$as_me: Found msvcp120.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&6;}
 
     # Need to check if the found msvcp is correct architecture
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcp100.dll architecture" >&5
-$as_echo_n "checking found msvcp100.dll architecture... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcp120.dll architecture" >&5
+$as_echo_n "checking found msvcp120.dll architecture... " >&6; }
     MSVCP_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCP_DLL"`
     if test "x$OPENJDK_TARGET_CPU_BITS" = x32 ; then
       CORRECT_MSVCP_ARCH=386
@@ -17304,15 +17304,15 @@ $as_echo_n "checking found msvcp100.dll architecture... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
       MSVCP_DLL="$POSSIBLE_MSVCP_DLL"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcp100.dll" >&5
-$as_echo_n "checking for msvcp100.dll... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcp120.dll" >&5
+$as_echo_n "checking for msvcp120.dll... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCP_DLL" >&5
 $as_echo "$MSVCP_DLL" >&6; }
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
 $as_echo "incorrect, ignoring" >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETYPE" >&5
-$as_echo "$as_me: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETYPE" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcp120.dll is $MSVCP_DLL_FILETYPE" >&5
+$as_echo "$as_me: The file type of the located msvcp120.dll is $MSVCP_DLL_FILETYPE" >&6;}
     fi
   fi
 
@@ -17321,17 +17321,17 @@ $as_echo "$as_me: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETY
 
   if test "x$MSVCP_DLL" = x ; then
     # Probe: Check in the Boot JDK directory.
-    POSSIBLE_MSVCP_DLL="$BOOT_JDK/bin/msvcp100.dll"
+    POSSIBLE_MSVCP_DLL="$BOOT_JDK/bin/msvcp120.dll"
 
   POSSIBLE_MSVCP_DLL="$POSSIBLE_MSVCP_DLL"
   METHOD="well-known location in Boot JDK"
   if test -e "$POSSIBLE_MSVCP_DLL" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcp100.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&5
-$as_echo "$as_me: Found msvcp100.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcp120.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&5
+$as_echo "$as_me: Found msvcp120.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&6;}
 
     # Need to check if the found msvcp is correct architecture
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcp100.dll architecture" >&5
-$as_echo_n "checking found msvcp100.dll architecture... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcp120.dll architecture" >&5
+$as_echo_n "checking found msvcp120.dll architecture... " >&6; }
     MSVCP_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCP_DLL"`
     if test "x$OPENJDK_TARGET_CPU_BITS" = x32 ; then
       CORRECT_MSVCP_ARCH=386
@@ -17342,15 +17342,15 @@ $as_echo_n "checking found msvcp100.dll architecture... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
       MSVCP_DLL="$POSSIBLE_MSVCP_DLL"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcp100.dll" >&5
-$as_echo_n "checking for msvcp100.dll... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcp120.dll" >&5
+$as_echo_n "checking for msvcp120.dll... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCP_DLL" >&5
 $as_echo "$MSVCP_DLL" >&6; }
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
 $as_echo "incorrect, ignoring" >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETYPE" >&5
-$as_echo "$as_me: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETYPE" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcp120.dll is $MSVCP_DLL_FILETYPE" >&5
+$as_echo "$as_me: The file type of the located msvcp120.dll is $MSVCP_DLL_FILETYPE" >&6;}
     fi
   fi
 
@@ -17369,17 +17369,17 @@ $as_echo "$as_me: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETY
     CYGWIN_SYSTEMROOT="$unix_path"
   fi
 
-    POSSIBLE_MSVCP_DLL="$CYGWIN_SYSTEMROOT/system32/msvcp100.dll"
+    POSSIBLE_MSVCP_DLL="$CYGWIN_SYSTEMROOT/system32/msvcp120.dll"
 
   POSSIBLE_MSVCP_DLL="$POSSIBLE_MSVCP_DLL"
   METHOD="well-known location in SYSTEMROOT"
   if test -e "$POSSIBLE_MSVCP_DLL" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcp100.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&5
-$as_echo "$as_me: Found msvcp100.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcp120.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&5
+$as_echo "$as_me: Found msvcp120.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&6;}
 
     # Need to check if the found msvcp is correct architecture
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcp100.dll architecture" >&5
-$as_echo_n "checking found msvcp100.dll architecture... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcp120.dll architecture" >&5
+$as_echo_n "checking found msvcp120.dll architecture... " >&6; }
     MSVCP_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCP_DLL"`
     if test "x$OPENJDK_TARGET_CPU_BITS" = x32 ; then
       CORRECT_MSVCP_ARCH=386
@@ -17390,15 +17390,15 @@ $as_echo_n "checking found msvcp100.dll architecture... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
       MSVCP_DLL="$POSSIBLE_MSVCP_DLL"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcp100.dll" >&5
-$as_echo_n "checking for msvcp100.dll... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcp120.dll" >&5
+$as_echo_n "checking for msvcp120.dll... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCP_DLL" >&5
 $as_echo "$MSVCP_DLL" >&6; }
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
 $as_echo "incorrect, ignoring" >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETYPE" >&5
-$as_echo "$as_me: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETYPE" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcp120.dll is $MSVCP_DLL_FILETYPE" >&5
+$as_echo "$as_me: The file type of the located msvcp120.dll is $MSVCP_DLL_FILETYPE" >&6;}
     fi
   fi
 
@@ -17406,8 +17406,8 @@ $as_echo "$as_me: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETY
 
   if test "x$MSVCP_DLL" = x ; then
     # Probe: If Visual Studio Express is installed, there is usually one with the debugger
-    if test "x$VS100COMNTOOLS" != x ; then
-      CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
+    if test "x$VS120COMNTOOLS" != x ; then
+      CYGWIN_VS_TOOLS_DIR="$VS120COMNTOOLS/.."
 
   windows_path="$CYGWIN_VS_TOOLS_DIR"
   if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
@@ -17419,20 +17419,20 @@ $as_echo "$as_me: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETY
   fi
 
       if test "x$OPENJDK_TARGET_CPU_BITS" = x64 ; then
-        POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcp100.dll | $GREP -i /x64/ | $HEAD --lines 1`
+        POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcp120.dll | $GREP -i /x64/ | $HEAD --lines 1`
       else
-        POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcp100.dll | $GREP -i /x86/ | $HEAD --lines 1`
+        POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcp120.dll | $GREP -i /x86/ | $HEAD --lines 1`
       fi
 
   POSSIBLE_MSVCP_DLL="$POSSIBLE_MSVCP_DLL"
-  METHOD="search of VS100COMNTOOLS"
+  METHOD="search of VS120COMNTOOLS"
   if test -e "$POSSIBLE_MSVCP_DLL" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcp100.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&5
-$as_echo "$as_me: Found msvcp100.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcp120.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&5
+$as_echo "$as_me: Found msvcp120.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&6;}
 
     # Need to check if the found msvcp is correct architecture
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcp100.dll architecture" >&5
-$as_echo_n "checking found msvcp100.dll architecture... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcp120.dll architecture" >&5
+$as_echo_n "checking found msvcp120.dll architecture... " >&6; }
     MSVCP_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCP_DLL"`
     if test "x$OPENJDK_TARGET_CPU_BITS" = x32 ; then
       CORRECT_MSVCP_ARCH=386
@@ -17443,15 +17443,15 @@ $as_echo_n "checking found msvcp100.dll architecture... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
       MSVCP_DLL="$POSSIBLE_MSVCP_DLL"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcp100.dll" >&5
-$as_echo_n "checking for msvcp100.dll... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcp120.dll" >&5
+$as_echo_n "checking for msvcp120.dll... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCP_DLL" >&5
 $as_echo "$MSVCP_DLL" >&6; }
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
 $as_echo "incorrect, ignoring" >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETYPE" >&5
-$as_echo "$as_me: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETYPE" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcp120.dll is $MSVCP_DLL_FILETYPE" >&5
+$as_echo "$as_me: The file type of the located msvcp120.dll is $MSVCP_DLL_FILETYPE" >&6;}
     fi
   fi
 
@@ -17463,12 +17463,12 @@ $as_echo "$as_me: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETY
     # (This was the original behaviour ; kept since it might turn up something)
     if test "x$CYGWIN_VC_INSTALL_DIR" != x ; then
       if test "x$OPENJDK_TARGET_CPU_BITS" = x64 ; then
-        POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcp100.dll | $GREP x64 | $HEAD --lines 1`
+        POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcp120.dll | $GREP x64 | $HEAD --lines 1`
       else
-        POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcp100.dll | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
+        POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcp120.dll | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
         if test "x$POSSIBLE_MSVCP_DLL" = x ; then
           # We're grasping at straws now...
-          POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcp100.dll | $HEAD --lines 1`
+          POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcp120.dll | $HEAD --lines 1`
         fi
       fi
 
@@ -17476,12 +17476,12 @@ $as_echo "$as_me: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETY
   POSSIBLE_MSVCP_DLL="$POSSIBLE_MSVCP_DLL"
   METHOD="search of VCINSTALLDIR"
   if test -e "$POSSIBLE_MSVCP_DLL" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcp100.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&5
-$as_echo "$as_me: Found msvcp100.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcp120.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&5
+$as_echo "$as_me: Found msvcp120.dll at $POSSIBLE_MSVCP_DLL using $METHOD" >&6;}
 
     # Need to check if the found msvcp is correct architecture
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcp100.dll architecture" >&5
-$as_echo_n "checking found msvcp100.dll architecture... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcp120.dll architecture" >&5
+$as_echo_n "checking found msvcp120.dll architecture... " >&6; }
     MSVCP_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCP_DLL"`
     if test "x$OPENJDK_TARGET_CPU_BITS" = x32 ; then
       CORRECT_MSVCP_ARCH=386
@@ -17492,15 +17492,15 @@ $as_echo_n "checking found msvcp100.dll architecture... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
       MSVCP_DLL="$POSSIBLE_MSVCP_DLL"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcp100.dll" >&5
-$as_echo_n "checking for msvcp100.dll... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcp120.dll" >&5
+$as_echo_n "checking for msvcp120.dll... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCP_DLL" >&5
 $as_echo "$MSVCP_DLL" >&6; }
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
 $as_echo "incorrect, ignoring" >&6; }
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETYPE" >&5
-$as_echo "$as_me: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETYPE" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcp120.dll is $MSVCP_DLL_FILETYPE" >&5
+$as_echo "$as_me: The file type of the located msvcp120.dll is $MSVCP_DLL_FILETYPE" >&6;}
     fi
   fi
 
@@ -17508,11 +17508,11 @@ $as_echo "$as_me: The file type of the located msvcp100.dll is $MSVCP_DLL_FILETY
   fi
 
   if test "x$MSVCP_DLL" = x ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcp100.dll" >&5
-$as_echo_n "checking for msvcp100.dll... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcp120.dll" >&5
+$as_echo_n "checking for msvcp120.dll... " >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-    as_fn_error $? "Could not find msvcp100.dll. Please specify using --with-msvcp-dll." "$LINENO" 5
+    as_fn_error $? "Could not find msvcp120.dll. Please specify using --with-msvcp-dll." "$LINENO" 5
   fi