1 files changed, 5 insertions, 0 deletions
diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index 4ed27cdf0d1..65051287b5a 100644
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -21,6 +21,9 @@ proc gcj_jni_compile_c_to_so {file {options {}}} {
   } elseif { [istarget "hppa*-hp-hpux*"] } {
       set so_extension "sl"
       set so_flag "-shared"
+  } elseif { [istarget "*-*-cygwin*"] || [istarget "*-*-mingw*"] } {
+      set so_extension "dll"
+      set so_flag "-shared"
   } else {
       set so_extension "so"
       set so_flag "-shared"
@@ -99,6 +102,8 @@ proc gcj_jni_test_one {file} {
       set so_extension "dylib"
   } elseif { [istarget "hppa*-hp-hpux*"] } {
       set so_extension "sl"
+  } elseif { [istarget "*-*-cygwin*"] || [istarget "*-*-mingw*"] } {
+      set so_extension "dll"
   } else {
       set so_extension "so"
   }