- Add JNIEXPORT to JLI_IsStaticJDK.

- Fix errornous dlsym call for isStaticJDK check in AWT_OnLoad.
jianglizhou · Aug 9, 2023 · 9e3c81b · 9e3c81b
1 parent a7ab571
commit 9e3c81b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/java.base/share/native/libjli/java.h b/src/java.base/share/native/libjli/java.h
@@ -73,7 +73,7 @@
 #define SPLASH_JAR_ENV_ENTRY "_JAVA_SPLASH_JAR"
 #define JDK_JAVA_OPTIONS "JDK_JAVA_OPTIONS"
 
-jboolean JLI_IsStaticJDK();
+JNIEXPORT jboolean JLI_IsStaticJDK();
 void JLI_SetStaticJDK();
 // FIXME: Add non-unix implementation.
 void* JLI_Lookup_Set_Static_JDK();

diff --git a/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c b/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c
@@ -118,7 +118,8 @@ AWT_OnLoad(JavaVM *vm, void *reserved)
     jvm = vm;
 
     // IsStaticJDK is defined by libjli. Check if it is statically linked.
-    jboolean isStaticJDK = (dlsym(NULL, "IsStaticJDK") != NULL);
+    IsStaticJDK = (JLI_IsStaticJDK_t)dlsym(RTLD_DEFAULT, "JLI_IsStaticJDK");
+    jboolean isStaticJDK = (IsStaticJDK != NULL) && (IsStaticJDK)();
     if (!isStaticJDK) {
         /* Get address of this library and the directory containing it. */
         dladdr((void *)AWT_OnLoad, &dlinfo);