Skip to content

Commit

Permalink
Update JDK8 windows compiles to use Visual Studio 2013
Browse files Browse the repository at this point in the history 
* [skip ci]
* disable the use of rebase
* eclipse-openj9/openj9#10129

Signed-off-by: Joe deKoning <joe_dekoning@ca.ibm.com>
  • Loading branch information
@jdekonin
jdekonin committed Oct 27, 2020
1 parent bea7d86 commit 9beaf32
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 89 deletions.
3 changes: 3 additions & 0 deletions closed/OpenJ9.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion common/autoconf/generated-configure.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

###############################################################################
#
Expand Down
42 changes: 21 additions & 21 deletions jdk/make/closed/autoconf/custom-hook.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -487,67 +487,67 @@ 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
])

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
fi
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
if test "x$MSVCP_DLL" = x ; then
# 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
Expand All @@ -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
Expand All @@ -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)
Expand Down
Loading

0 comments on commit 9beaf32

Please sign in to comment.