Skip to content
This repository has been archived by the owner on Oct 22, 2020. It is now read-only.

Update the 0.18.0 release branch with the latest changes from the openj9 branch #38

Merged
merged 4 commits into from
Jan 8, 2020
Merged

Update the 0.18.0 release branch with the latest changes from the openj9 branch #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f50a4d8
Add jitserver launcher in OpenJ9 builds
Jan 3, 2020
1d184c0
Remove the check on a specific OpenSSL API for JITServer
a7ehuo Jan 6, 2020
e2a5fe7
Merge pull request #35 from a7ehuo/removeCheckOpenSSLAPIJDK13
keithc-ca Jan 7, 2020
c6ae871
Merge pull request #33 from ashu-mehra/include_jitserver_launcher
keithc-ca Jan 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion closed/OpenJ9.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ===========================================================================
# (c) Copyright IBM Corp. 2017, 2019 All Rights Reserved
# (c) Copyright IBM Corp. 2017, 2020 All Rights Reserved
# ===========================================================================
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
Expand Down Expand Up @@ -171,6 +171,12 @@ openj9_add_jdk_special = \
$(foreach target, $(JDK_OUTPUTDIR)/$(OPENJ9_BIN_OR_LIB_DIR) $(call FindLibDirForModule, java.base), \
$(eval $(call openj9_add_jdk_rules, $(target)/$(strip $1), $(OUTPUTDIR)/vm/$(strip $2))))

# jitserver

ifeq (true,$(OPENJ9_ENABLE_JITSERVER))
$(call openj9_add_jdk_basic, $(JDK_OUTPUTDIR)/bin $(call FindExecutableDirForModule, java.base), jitserver$(EXE_SUFFIX))
endif

# redirector

$(foreach subdir, j9vm server, \
Expand Down Expand Up @@ -356,6 +362,13 @@ else
SPEC_SED_SCRIPT += $(call SedDisable,module_ddr)
endif

# Adjust JITServer enablement flags.
ifeq (true,$(OPENJ9_ENABLE_JITSERVER))
FEATURE_SED_SCRIPT += $(call SedEnable,build_jitserver)
else
FEATURE_SED_SCRIPT += $(call SedDisable,build_jitserver)
endif

# Disable windows rebase.
SPEC_SED_SCRIPT += $(call SedDisable,uma_windowsRebase)

Expand Down
15 changes: 1 addition & 14 deletions closed/autoconf/custom-hook.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ===========================================================================
# (c) Copyright IBM Corp. 2017, 2019 All Rights Reserved
# (c) Copyright IBM Corp. 2017, 2020 All Rights Reserved
# ===========================================================================
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
Expand Down Expand Up @@ -616,19 +616,6 @@ AC_DEFUN([CONFIGURE_OPENSSL],
AC_MSG_CHECKING([if we should bundle openssl])
AC_MSG_RESULT([$BUNDLE_OPENSSL])

if test "x$OPENJ9_ENABLE_JITSERVER" = xtrue ; then
if test "x$OPENJDK_TARGET_OS" = xlinux ; then
if test "x$OPENSSL_DIR" != x ; then
AC_MSG_CHECKING([if the required OPENSSL API exists for JITServer in $OPENSSL_DIR])
if $GREP -q -w SSL_CTX_set_ecdh_auto "$OPENSSL_DIR/include/openssl/ssl.h" 2> /dev/null ; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
AC_MSG_ERROR([SSL_CTX_set_ecdh_auto is required by JITServer])
fi
fi
fi
fi
fi

AC_SUBST(OPENSSL_BUNDLE_LIB_PATH)
Expand Down