Merge pull request #20096 from JasonFengJ9/jdk24staticbuild

JDK24 adds JVM_IsStaticallyLinked(void)
eclipse-openj9 · Sep 3, 2024 · 0a83a77 · 0a83a77
2 parents 566a1b7 + 8cd1362
commit 0a83a77
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/runtime/j9vm/exports.cmake b/runtime/j9vm/exports.cmake
@@ -463,6 +463,7 @@ endif()
 if(NOT JAVA_SPEC_VERSION LESS 24)
 	jvm_add_exports(jvm
 		JVM_IsContainerized
+		JVM_IsStaticallyLinked
 	)
 endif()
 

diff --git a/runtime/j9vm/j9vmnatives.xml b/runtime/j9vm/j9vmnatives.xml
@@ -476,5 +476,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 	<exports group="jdk24">
 		<!-- Additions for Java 24 (General) -->
 		<export name="JVM_IsContainerized"/>
+		<export name="JVM_IsStaticallyLinked"/>
 	</exports>
 </exportlists>
diff --git a/runtime/j9vm/javanextvmi.cpp b/runtime/j9vm/javanextvmi.cpp
@@ -829,6 +829,18 @@ JVM_IsContainerized(void)
 
 	return isContainerized;
 }
+
+/**
+ * @brief Determine if the JVM is statically linked, always returns JNI_FALSE.
+ *
+ * @return JNI_FALSE
+ */
+JNIEXPORT jboolean JNICALL
+JVM_IsStaticallyLinked(void)
+{
+	/* OpenJDK removed static builds using --enable-static-build. */
+	return JNI_FALSE;
+}
 #endif /* JAVA_SPEC_VERSION >= 24 */
 
 } /* extern "C" */
diff --git a/runtime/redirector/forwarders.m4 b/runtime/redirector/forwarders.m4
@@ -444,3 +444,5 @@ _IF([JAVA_SPEC_VERSION >= 23],
 	[_X(JVM_GetCDSConfigStatus, JNICALL, false, jint, void)])
 _IF([JAVA_SPEC_VERSION >= 24],
 	[_X(JVM_IsContainerized, JNICALL, false, jboolean, void)])
+_IF([JAVA_SPEC_VERSION >= 24],
+	[_X(JVM_IsStaticallyLinked, JNICALL, false, jboolean, void)])