Merge openj9 into openj9-staging

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
babsingh · Sep 5, 2024 · f0701aa · f0701aa
2 parents 47521f3 + b0d0c48
commit f0701aa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk
@@ -110,7 +110,7 @@ ifeq (windows,$(OPENJDK_TARGET_OS))
   # set Visual Studio environment
   # wrap PATH in quotes as it contains spaces (unix path)
   EXPORT_COMPILER_ENV_VARS := PATH="$(PATH)"
-else ifeq (zos,$(OPENJDK_TARGET_OS))
+else ifeq ($(call isTargetOs, zos), true)
   UnixPath = $1
   # Allow options to follow the input file name
   EXPORT_COMPILER_ENV_VARS := _CC_CCMODE=1 _C89_CCMODE=1 _CXX_CCMODE=1

diff --git a/closed/custom/modules/java.base/Copy.gmk b/closed/custom/modules/java.base/Copy.gmk
@@ -1,5 +1,5 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2017, 2023 All Rights Reserved
+# (c) Copyright IBM Corp. 2017, 2024 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
@@ -30,7 +30,7 @@ $(call openj9_copy_files,, \
 	$(OPENJ9_VM_BUILD_DIR)/include/jvmti.h \
 	$(INCLUDE_TARGET_DIR)/jvmti.h)
 
-ifeq (zos,$(OPENJDK_TARGET_OS))
+ifeq ($(call isTargetOs, zos), true)
 $(call openj9_copy_files,, \
 	$(OPENJ9_TOPDIR)/runtime/include/jni_convert.h \
 	$(INCLUDE_TARGET_DIR)/jni_convert.h)
@@ -99,8 +99,7 @@ $(call openj9_copy_shlibs, \
 	omrsig \
 	)
 
-ifeq (zos,$(OPENJDK_TARGET_OS))
-
+ifeq ($(call isTargetOs, zos), true)
 $(call openj9_copy_files_and_debuginfos, \
 	$(addsuffix /$(call SHARED_LIBRARY,j9a2e), \
 		$(OPENJ9_VM_BUILD_DIR) \

diff --git a/closed/make/modules/ibm.healthcenter/Copy.gmk b/closed/make/modules/ibm.healthcenter/Copy.gmk
@@ -1,5 +1,5 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2021, 2021 All Rights Reserved
+# (c) Copyright IBM Corp. 2021, 2024 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
@@ -32,7 +32,7 @@ $(HEALTHCENTER_EXTRACT) : $(HEALTHCENTER_JAR)
 	@$(RM) -rf $(@D)
 	$(call MakeDir, $(@D))
 	$(UNZIP) -q $< -d $(@D)
-  ifeq (zos,$(OPENJDK_TARGET_OS))
+  ifeq ($(call isTargetOs, zos), true)
 	$(CHTAG) -c ISO8859-1 -t $(HEALTHCENTER_HOME)/healthcenter.properties
   endif
 	@$(TOUCH) $@
@@ -70,7 +70,7 @@ HEALTHCENTER_LIBRARIES = \
 	$(wildcard $(HEALTHCENTER_HOME)/plugins/$(call SHARED_LIBRARY,hcmqtt))
 
 # User-configurable .properties files should be encoded in EBCDIC on z/OS.
-ifeq (zos,$(OPENJDK_TARGET_OS))
+ifeq ($(call isTargetOs, zos), true)
   FIX_ENCODING := | $(ICONV) -f ISO8859-1 -t IBM-1047
 else
   FIX_ENCODING :=