Merge pull request ibmruntimes#359 from vsebe/ibm-jdk11-jcldev.jzos

JZOS Integration

Author: keithc-ca

.gitignore

@@ -27,6 +27,7 @@
 /closedj9
 /CMPIBMPKCS
 /CMPJAAS
+/CMPJZOS
 /CMPSAF
 /omr
 /openj9

closed/Components.gmk

@@ -57,8 +57,29 @@ $(foreach module, $(CMP_MODULES), \
 	$(eval $(call stage_module_rule,$(module))) \
 )
 
+JZOS_NATIVES_DIR := $(call find_native_src_dir,ibm.jzos)
+JZOS_BUILD_VERSION_PROPERTIES := $(JZOS_NATIVES_DIR)/build_version.properties
+
+# Copy build_version.properties file to ibm.jzos stage directory
+$(eval $(call SetupCopyFiles, COPY_JZOS_BUILD_VERSION_PROPERTIES, \
+	DEST := $(SUPPORT_OUTPUTDIR)/j9jcl_sources/ibm.jzos/share/classes/com/ibm/jzos,\
+	FILES := $(JZOS_BUILD_VERSION_PROPERTIES), \
+))
+
+ibm.jzos-stage : $(COPY_JZOS_BUILD_VERSION_PROPERTIES)
+
 ibm.os390.security_target := libSecurityServices.so
 ibm.security.auth_target := all_$(OPENJDK_BUILD_CPU_BITS)
+ibm.jzos_target := build_jzos
+ibm.zosrrs_target := build_rrs
+
+JZOS_BUILD_VERSION := \
+	$(shell $(SED) -n -e 's/^BUILD_VERSION=//p' < $(JZOS_BUILD_VERSION_PROPERTIES))
+
+# set arch type: 16 for 64 bits or 10 for 31 bits
+JZOS_ARCH := 16
+JZOS_BUILD_ENV_VARS_FILE := $(JZOS_NATIVES_DIR)/build.rc
+JZOS_JDFSORT := $(JZOS_NATIVES_DIR)/jdfsort/jdfsort
 
 # generate_lib_target
 # -------------------
@@ -67,10 +88,24 @@ ibm.security.auth_target := all_$(OPENJDK_BUILD_CPU_BITS)
 define generate_lib_target
 $1-libs :
 	@$(ECHO) Compiling $1 native
+  ifeq (,$(findstring $1,ibm.jzos ibm.zosrrs))
 	$(MAKE) -C $(call find_native_src_dir,$1) \
-		JAVA_HOME=$(BOOT_JDK) \
 		HEADERS_DIR=$(SUPPORT_OUTPUTDIR)/headers/$1/ \
+		JAVA_HOME=$(BOOT_JDK) \
 		$$($1_target)
+  else
+	export _BPX_SHAREAS=NO HLQ_ZOS=BLD.ZOSR23.PIDPLUS \
+		&& . $(JZOS_BUILD_ENV_VARS_FILE) \
+		&& $(MAKE) -C $(call find_native_src_dir,$1) \
+			BUILD_VERSION="$(JZOS_BUILD_VERSION)" \
+			HEADERS_DIR=$(SUPPORT_OUTPUTDIR)/headers/$1/ \
+			JAVA_HOME=$(BOOT_JDK) \
+			JDFSORT=$(JZOS_JDFSORT) \
+			JZOS_HOME=$(call find_native_src_dir,$1) \
+			SDK=$(JZOS_ARCH) \
+			$$($1_target)
+  endif
+	@$(ECHO) $1 native compile completed
 endef
 
 # Targets to compile native code
@@ -101,7 +136,23 @@ $(call FindLibDirForModule,$1)/$(notdir $2) : $2
 endef
 
 # Targets to copy native libs
-$(foreach module, $(CMP_MODULES), \
+$(foreach module, $(filter-out ibm.jzos ibm.zosrrs,$(CMP_MODULES)), \
 	$(foreach file, \
 		$(wildcard $(call find_native_src_dir,$(module))/*$(SHARED_LIBRARY_SUFFIX)), \
 		$(eval $(call add_component_natives_libs,$(module),$(file)))))
+
+# Target to copy ibm.zosrrs native libs
+$(eval $(call add_component_natives_libs,ibm.zosrrs,$(call find_native_src_dir,ibm.zosrrs)/libzosrrs$(SHARED_LIBRARY_SUFFIX)))
+
+# Target to copy ibm.jzos native libs
+$(foreach file, \
+	$(wildcard $(addprefix $(JZOS_NATIVES_DIR)/,JVMLDM16 libjzos$(SHARED_LIBRARY_SUFFIX) libjzos.x)), \
+	$(eval $(call add_component_natives_libs,ibm.jzos,$(file))))
+
+# Copy jdfsort to $(SUPPORT_OUTPUTDIR)/modules_cmds/ibm.jzos/
+$(eval $(call SetupCopyFiles, COPY_JDFSORT, \
+	DEST := $(call FindExecutableDirForModule,ibm.jzos),\
+	FILES := $(JZOS_JDFSORT), \
+))
+
+ibm.jzos-copy : $(COPY_JDFSORT)

closed/DDR.gmk

@@ -168,7 +168,7 @@ $(eval $(call SetupJavaCompilation,BUILD_DDR_STUBS, \
 	SETUP := GENERATE_USINGJDKBYTECODE, \
 	BIN := $(DDR_STUBS_BIN), \
 	CLASSPATH := $(JDK_OUTPUTDIR)/modules/java.base, \
-	SRC := $(OPENJ9_TOPDIR)/jcl/src/ibm.jzos/share/classes \
+	SRC := $(OPENJ9_TOPDIR)/jcl/stubs/ibm.jzos/share/classes \
 	))
 
 # Finally, we depend upon the stub classes.

closed/custom/CompileJavaModules.gmk

@@ -18,6 +18,7 @@
 # 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
 # ===========================================================================
 
+ibm.jzos_COPY += .properties
 java.base_COPY += ExternalMessages.properties
 openj9.gpu_COPY += ibm_gpu_thresholds.properties
 jdk.jcmd_EXCLUDES += sun

closed/custom/Images-pre.gmk

@@ -0,0 +1,33 @@
+# ===========================================================================
+# (c) Copyright IBM Corp. 2020, 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
+# published by the Free Software Foundation.
+#
+# IBM designates this particular file as subject to the "Classpath" exception
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
+# ===========================================================================
+
+ifeq ($(OPENJDK_TARGET_OS), zos)
+  MVSTOOLS_DIR := $(TOPDIR)/CMPJZOS/mvstools
+
+  ifneq ($(wildcard $(MVSTOOLS_DIR)/*), )
+    $(eval $(call SetupCopyFiles, JDK_COPY_MVSTOOLS, \
+        SRC := $(MVSTOOLS_DIR), \
+        DEST := $(JDK_IMAGE_DIR)/mvstools, \
+        FILES := $(call FindFiles, $(MVSTOOLS_DIR)/), \
+    ))
+
+    JDK_TARGETS += $(JDK_COPY_MVSTOOLS)
+  endif
+endif

closed/custom/Main-post.gmk closed/custom/Main-pre.gmk

@@ -48,3 +48,5 @@ CMP_COPY_TARGETS := $(addsuffix -copy, $(CMP_LIBS_MODULES))
 ALL_TARGETS += $(CMP_LIBS_TARGETS) $(CMP_COPY_TARGETS)
 
 $(foreach module, $(CMP_LIBS_MODULES), $(eval $(module)_JMOD_DEPS += $(module)-copy))
+
+clean : $(addprefix clean-, $(CMP_LIBS_MODULES))

closed/custom/Main.gmk

@@ -111,3 +111,6 @@ clean-openj9-only-docs :
 	@$(PRINTF) " done\n"
 
 ALL_TARGETS += clean-openj9-only-docs
+
+# include Main-pre.gmk
+$(eval $(call IncludeCustomExtension, Main-pre.gmk))

closed/custom/common/ComponentsCommon.gmk

@@ -22,7 +22,7 @@ COMPONENTS :=
 
 ifeq ($(OPENJDK_TARGET_OS), zos)
   COMPONENTS += \
-	$(notdir $(wildcard $(addprefix $(TOPDIR)/,CMPIBMPKCS CMPJAAS CMPSAF)))
+	$(notdir $(wildcard $(addprefix $(TOPDIR)/,CMPIBMPKCS CMPJAAS CMPJZOS CMPSAF)))
 endif
 
 CMP_MODULES := \
@@ -38,7 +38,8 @@ PLATFORM_MODULES += $(CMP_MODULES)
 # $1 = module name
 find_native_src_dir = \
 	$(wildcard $(addsuffix build/mvs/$(OPENJDK_BUILD_CPU_BITS)-bit, \
-		$(patsubst %/src/$1, %/, $(wildcard $(TOPDIR)/*/src/$1))))
+		$(patsubst %/src/$1, %/, $(wildcard $(TOPDIR)/*/src/$1))) \
+		$(patsubst %/$1, %/$(OPENJDK_TARGET_OS)/share, $(wildcard $(TOPDIR)/*/src/$1)))
 
 CMP_LIBS_MODULES := \
 	$(foreach module, $(CMP_MODULES), \

closed/custom/common/SetupJavaCompilers.gmk

@@ -20,8 +20,10 @@
 
 # OpenJ9 requires more lenient javac warnings for these modules.
 WARNING_MODULES := \
+	ibm.jzos \
 	ibm.security.auth \
 	ibm.security.pkcs \
+	ibm.zosrrs \
 	java.base \
 	jdk.management \
 	openj9.dataaccess \