From f50a4d816e29f64704b774fd2899993a1ddd009d Mon Sep 17 00:00:00 2001 From: Ashutosh Mehra Date: Fri, 3 Jan 2020 22:53:15 +0000 Subject: [PATCH 1/2] Add jitserver launcher in OpenJ9 builds If --enable-jitserver configuration option is set, then enable building of jitserver launcher and include it in the jdk. Signed-off-by: Ashutosh Mehra --- closed/OpenJ9.gmk | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk index 84543e137c..0386e5b8ec 100644 --- a/closed/OpenJ9.gmk +++ b/closed/OpenJ9.gmk @@ -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 @@ -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, \ @@ -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) From 1d184c0d79010fa85c874eb57fe995566299005c Mon Sep 17 00:00:00 2001 From: Annabelle Huo Date: Mon, 6 Jan 2020 15:13:18 +0000 Subject: [PATCH 2/2] Remove the check on a specific OpenSSL API for JITServer With the change in eclipse/openj9#8145, `OpenSSL` symbols are dynamically loaded at the runtime. During the build time, there is no longer a dependency on the installed `OpenSSL` version on the build machines. Removed the code that checks `SSL_CTX_set_ecdh_auto` during config. Signed-off-by: Annabelle Huo --- closed/autoconf/custom-hook.m4 | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/closed/autoconf/custom-hook.m4 b/closed/autoconf/custom-hook.m4 index 1432421801..2dae34f6cb 100644 --- a/closed/autoconf/custom-hook.m4 +++ b/closed/autoconf/custom-hook.m4 @@ -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 @@ -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)