From 8cd1362ff8c2ea3738abc30ce94e084ad7d08006 Mon Sep 17 00:00:00 2001
From: Jason Feng <fengj@ca.ibm.com>
Date: Tue, 3 Sep 2024 13:37:30 -0400
Subject: [PATCH] JDK24 adds JVM_IsStaticallyLinked(void)

Support [JDK-8333301] Remove static builds using --enable-static-build.

Signed-off-by: Jason Feng <fengj@ca.ibm.com>
---
 runtime/j9vm/exports.cmake       |  1 +
 runtime/j9vm/j9vmnatives.xml     |  1 +
 runtime/j9vm/javanextvmi.cpp     | 12 ++++++++++++
 runtime/redirector/forwarders.m4 |  2 ++
 4 files changed, 16 insertions(+)

diff --git a/runtime/j9vm/exports.cmake b/runtime/j9vm/exports.cmake
index cdd1d87e348..c560065d8e5 100644
--- 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
index b792dd6ffb2..cb2879bf49f 100644
--- 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
index 6308573ea75..bffb74d8839 100644
--- 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
index b82beaf18f5..83b68dbf58d 100644
--- 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)])