Merge pull request #60 from JasonFengJ9/mergestaging

Merge master jdk-23.0.1+11 into openj9-staging

.copyrightignore

@@ -32,6 +32,8 @@
 # ===========================================================================
 
 /src/bsd/doc/
+/src/hotspot/share/jfr/metadata/metadata.xml
+/src/hotspot/share/jfr/metadata/metadata.xsd
 /src/jdk.crypto.ec/share/native/libsunec/impl/
 /src/linux/doc/
 /src/solaris/doc/

.jcheck/conf

@@ -1,7 +1,7 @@
 [general]
-project=jdk
+project=jdk-updates
 jbs=JDK
-version=23
+version=23.0.1
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists

closed/GensrcJ9JCL.gmk

@@ -49,6 +49,7 @@ $(eval $(call SetupCopyFiles,COPY_OVERLAY_FILES, \
 		src/java.base/share/classes/java/util/Timer.java \
 		src/java.base/share/classes/java/util/TimerTask.java \
 		src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java \
+		src/java.base/share/classes/java/util/zip/ZipFile.java \
 		src/java.base/share/classes/jdk/internal/access/JavaNetInetAddressAccess.java \
 		src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java \
 		src/java.base/share/classes/module-info.java \
@@ -58,6 +59,15 @@ $(eval $(call SetupCopyFiles,COPY_OVERLAY_FILES, \
 		src/java.base/share/classes/sun/security/provider/SecureRandom.java \
 		src/java.base/unix/classes/java/lang/ProcessEnvironment.java \
 		src/java.base/unix/classes/sun/security/provider/NativePRNG.java \
+		src/java.se/share/data/jdwp/jdwp.spec \
+		src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventHandler.java \
+		src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java \
+		src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java \
+		src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java \
+		src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_de.java \
+		src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java \
+		src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java \
+		src/jdk.jdi/share/classes/com/sun/tools/jdi/EventSetImpl.java \
 	))
 
 IncludeIfUnsure := -includeIfUnsure -noWarnIncludeIf

closed/OpenJ9.gmk

@@ -104,16 +104,15 @@ ifeq (false,$(WARNINGS_AS_ERRORS_OPENJ9))
   export UMA_SUPPRESS_WARNINGS_AS_ERRORS := 1
 endif
 
-ifeq (windows,$(OPENJDK_TARGET_OS))
+ifeq ($(call isTargetOs, windows), true)
   # convert windows path to unix path
   UnixPath = $(shell $(PATHTOOL) -u $1)
-  # set Visual Studio environment
+  # set up Visual Studio environment
   # - wrap LIB in single-quotes to hide backslashes from make
-  # - wrap PATH in double-quotes as it may contain spaces (unix path)
-  EXPORT_COMPILER_ENV_VARS := LIB='$(OPENJ9_VS_LIB)' PATH="$(PATH)"
-else ifeq (zos,$(OPENJDK_TARGET_OS))
+  EXPORT_COMPILER_ENV_VARS := LIB='$(OPENJ9_VS_LIB)'
+else ifeq ($(call isTargetOs, zos), true)
   UnixPath = $1
-  # Allow options to follow the input file name
+  # allow options to follow the input file name
   EXPORT_COMPILER_ENV_VARS := _CC_CCMODE=1 _C89_CCMODE=1 _CXX_CCMODE=1
 else
   UnixPath = $1

closed/custom/common/Modules.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
@@ -41,15 +41,20 @@ else
 	#
 endif
 
+ifeq (false,$(OPENJ9_ENABLE_JFR))
+  MODULES_FILTER += \
+	jdk.jfr \
+	jdk.management.jfr \
+	#
+endif
+
 MODULES_FILTER += \
 	jdk.aot \
 	jdk.hotspot.agent \
 	jdk.internal.vm.ci \
 	jdk.internal.vm.compiler \
 	jdk.internal.vm.compiler.management \
-	jdk.jfr \
 	jdk.jstatd \
-	jdk.management.jfr \
 	#
 
 TOP_SRC_DIRS += \

closed/custom/modules/java.base/Copy.gmk

@@ -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 /$(LIBRARY_PREFIX)j9a2e$(SHARED_LIBRARY_SUFFIX), \
 		$(OPENJ9_VM_BUILD_DIR) \

closed/make/modules/ibm.healthcenter/Copy.gmk

@@ -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/$(LIBRARY_PREFIX)hcmqtt$(SHARED_LIBRARY_SUFFIX))
 
 # 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 :=

closed/make/modules/openjceplus/Lib.gmk

@@ -29,6 +29,7 @@ OPENJCEPLUS_JCE_CLASSPATH := $(JDK_OUTPUTDIR)/modules/openjceplus:$(JDK_OUTPUTDI
 OPENJCEPLUS_JGSKIT_MAKE := jgskit.mak
 OPENJCEPLUS_JGSKIT_MAKE_PATH := $(OPENJCEPLUS_TOPDIR)/src/main/native
 OPENJCEPLUS_JGSKIT_PLATFORM :=
+OPENJCEPLUS_VS_LIB :=
 
 ifeq ($(call isTargetOs, aix), true)
   OPENJCEPLUS_JGSKIT_PLATFORM := ppc-aix64
@@ -47,6 +48,7 @@ else ifeq ($(call isTargetOs, windows), true)
     OPENJCEPLUS_JCE_CLASSPATH := "$(call MixedPath,$(JDK_OUTPUTDIR)/modules/openjceplus)\;$(call MixedPath,$(JDK_OUTPUTDIR)/modules/java.base)"
     OPENJCEPLUS_JGSKIT_MAKE := jgskit.win64.mak
     OPENJCEPLUS_JGSKIT_PLATFORM := win64
+    OPENJCEPLUS_VS_LIB := LIB='$(OPENJ9_VS_LIB)'
   endif
 endif
 
@@ -59,6 +61,7 @@ endif # OPENJCEPLUS_JGSKIT_PLATFORM
 compile-libs :
 	@$(ECHO) Compiling OpenJCEPlus native code
 	export \
+			$(OPENJCEPLUS_VS_LIB) \
 			GSKIT_HOME=$(OPENJCEPLUS_GSKIT_HOME) \
 			JAVA_HOME=$(OPENJCEPLUS_BOOT_JDK) \
 			JCE_CLASSPATH=$(OPENJCEPLUS_JCE_CLASSPATH) \

closed/openjdk-tag.gmk

@@ -1 +1 @@
-OPENJDK_TAG := jdk-23+37
+OPENJDK_TAG := jdk-23.0.1+11

closed/openssl.gmk

@@ -25,6 +25,7 @@ ifeq (,$(wildcard $(SPEC)))
 endif
 
 include $(SPEC)
+include MakeBase.gmk
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
   # Configure normally demands that we use an implementation of perl that produces
@@ -63,7 +64,11 @@ endif # windows
 # Identify the desired openssl target configuration.
 OPENSSL_TARGET :=
 ifeq ($(OPENJDK_TARGET_OS), aix)
-  OPENSSL_TARGET := aix64-cc
+  ifeq ($(call isCompiler, clang), true)
+    OPENSSL_TARGET := aix64-clang
+  else ifeq ($(call isCompiler, xlc), true)
+    OPENSSL_TARGET := aix64-cc
+  endif
 else ifeq ($(OPENJDK_TARGET_OS), linux)
   ifneq (,$(filter aarch64 ppc64le x86_64, $(OPENJDK_TARGET_CPU)))
     OPENSSL_TARGET := linux-$(OPENJDK_TARGET_CPU)