Merge pull request #353 from ibmruntimes/openj9

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

THIRD_PARTY_README

@@ -1334,11 +1334,13 @@ SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 
-%% This notice is provided with respect to Joni v1.1.9, which may be 
+%% This notice is provided with respect to Joni v2.1.16, which may be
 included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
+Copyright (c) 2017 JRuby Team
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

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
@@ -86,6 +86,22 @@ endif
 	stage_openj9_build_jdk \
 	#
 
+# jitserver
+
+ifeq (true,$(OPENJ9_ENABLE_JITSERVER))
+$(eval $(call SetupCopyFiles,OPENJ9_STAGED_FILES, \
+	DEST := $(JDK_OUTPUTDIR)/bin, \
+	SRC := $(OPENJ9_VM_BUILD_DIR), \
+	FILES := jitserver$(EXE_SUFFIX) \
+	))
+
+$(eval $(call SetupCopyFiles,OPENJ9_STAGED_FILES, \
+	DEST := $(JDK_OUTPUTDIR)/jre/bin, \
+	SRC := $(OPENJ9_VM_BUILD_DIR), \
+	FILES := jitserver$(EXE_SUFFIX) \
+	))
+endif # OPENJ9_ENABLE_JITSERVER
+
 # redirector
 
 $(foreach subdir, j9vm server, \
@@ -323,6 +339,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
+
 # openj9_stage_buildspec_file
 # ---------------------------
 # param 1 = The simple name of the file to copy.