From f8abe53240b55be4d8e4880906e22e5237e43f6f Mon Sep 17 00:00:00 2001
From: Dave Korn <dave.korn.cygwin@gmail.com>
Date: Tue, 28 Apr 2009 15:05:56 +0000
Subject: [PATCH] * testsuite/libjava.jvmti/jvmti-interp.exp 
 (gcj_jni_compile_c_to_so):  Fix so extension to '.dll' on win32. 	*
 testsuite/lib/libjava.exp (libjava_init):  Likewise. 	*
 testsuite/libjava.jni/jni.exp 	(gcj_jni_compile_c_to_so):  Likewise. 
 (gcj_jni_test_one):  Likewise.

From-SVN: r146896
---
 libjava/ChangeLog                                | 9 +++++++++
 libjava/testsuite/lib/libjava.exp                | 2 ++
 libjava/testsuite/libjava.jni/jni.exp            | 5 +++++
 libjava/testsuite/libjava.jvmti/jvmti-interp.exp | 3 +++
 4 files changed, 19 insertions(+)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 294a440748c..cb57e6f71eb 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2009-04-28  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* testsuite/libjava.jvmti/jvmti-interp.exp
+	(gcj_jni_compile_c_to_so):  Fix so extension to '.dll' on win32.
+	* testsuite/lib/libjava.exp (libjava_init):  Likewise.
+	* testsuite/libjava.jni/jni.exp
+	(gcj_jni_compile_c_to_so):  Likewise.
+	(gcj_jni_test_one):  Likewise.
+
 2009-04-28  Andrew Haley  <aph@redhat.com>
 
 	PR libgcj/39899
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index a31c2bc63d3..510e4ac80d8 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -202,6 +202,8 @@ proc libjava_init { args } {
 
     if { [istarget "*-*-darwin*"] } {
 	set so_extension "dylib"
+    } elseif { [istarget "*-*-cygwin*"] || [istarget "*-*-mingw*"] } {
+	set so_extension "dll"
     } else {
 	set so_extension "so"
     }
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"
   }
diff --git a/libjava/testsuite/libjava.jvmti/jvmti-interp.exp b/libjava/testsuite/libjava.jvmti/jvmti-interp.exp
index 68b1fc8c177..e81eda52025 100644
--- a/libjava/testsuite/libjava.jvmti/jvmti-interp.exp
+++ b/libjava/testsuite/libjava.jvmti/jvmti-interp.exp
@@ -25,6 +25,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"