From 0bf8762e7da8919e3b4ab1e5d4ac1c2e4658fbd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandar=20Pejovi=C4=87?= <aleksandar.pejovic@oracle.com>
Date: Fri, 24 Oct 2025 18:06:57 +0200
Subject: [PATCH] Fix shim exports for AWT on Windows

---
 .../svm/hosted/jdk/JNIRegistrationAWTSupport.java  | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationAWTSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationAWTSupport.java
index abc1805b9ff7..d8255d929e0c 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationAWTSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationAWTSupport.java
@@ -46,7 +46,6 @@ public void afterAnalysis(AfterAnalysisAccess access) {
         JNIRegistrationSupport jniRegistrationSupport = JNIRegistrationSupport.singleton();
         if (jniRegistrationSupport.isRegisteredLibrary("awt")) {
             jniRegistrationSupport.addJvmShimExports(
-                            "jio_snprintf",
                             "JVM_IsStaticallyLinked");
             jniRegistrationSupport.addJavaShimExports(
                             "JNU_CallMethodByName",
@@ -62,7 +61,8 @@ public void afterAnalysis(AfterAnalysisAccess access) {
                             "JNU_ThrowIllegalArgumentException",
                             "JNU_ThrowInternalError",
                             "JNU_ThrowNullPointerException",
-                            "JNU_ThrowOutOfMemoryError");
+                            "JNU_ThrowOutOfMemoryError",
+                            "jio_snprintf");
             if (isWindows()) {
                 jniRegistrationSupport.addJvmShimExports(
                                 "JVM_CurrentTimeMillis",
@@ -94,14 +94,8 @@ public void afterAnalysis(AfterAnalysisAccess access) {
             jniRegistrationSupport.addJavaShimExports(
                             "JNU_GetEnv",
                             "JNU_ThrowByName",
-                            "JNU_ThrowNullPointerException");
-            if (isWindows()) {
-                jniRegistrationSupport.addJavaShimExports(
-                                "jio_snprintf");
-            } else {
-                jniRegistrationSupport.addJvmShimExports(
-                                "jio_snprintf");
-            }
+                            "JNU_ThrowNullPointerException",
+                            "jio_snprintf");
         }
     }