diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 35c5c87a4ad71ef0957d66aad6ec1f90ce996c46..d5f175c9a1d6866c2626a36828a275e3f40e9b75 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-03  Andrew Haley  <aph@redhat.com>
+
+	* testsuite/libjava.lang/Float_2.java: New file.
+
 2006-03-31  Andreas Tobler  <a.tobler@schweiz.ch>
 
 	* posix.cc (_Jv_platform_nanotime): Declare id with clockid_t.
diff --git a/libjava/testsuite/libjava.lang/Float_2.java b/libjava/testsuite/libjava.lang/Float_2.java
new file mode 100644
index 0000000000000000000000000000000000000000..5d019533d53f71c6f5631d1b91b89f0860205fec
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/Float_2.java
@@ -0,0 +1,138 @@
+// Test floating-point to integer conversion.  We do this twice, once
+// with literal conversions that can be optimized away and once using
+// a static field that can't.
+
+public class Float_2
+{
+  public static double zero = 0.0;
+
+  public static void main (String argv[])
+  {
+    {
+      int itest = (int)(float)(0.0/0.0);
+      if (itest != 0)
+	System.err.println ("literal inf error 1: " + itest);	
+    }
+    {
+      int itest = (int)(0.0/0.0);
+      if (itest != 0)
+	System.err.println ("literal inf error 2" + itest);	
+    }
+    {
+      long ltest = (long)(0.0/0.0);
+      if (ltest != 0)
+	System.err.println ("literal inf error 3" + ltest);	
+    }
+    {
+      long ltest = (long)(float)(0.0/0.0);
+      if (ltest != 0)
+	System.err.println ("literal inf error 4" + ltest);	
+    }
+      
+    {
+      int itest = (int)(float)(1.0/0.0);
+      if (itest != Integer.MAX_VALUE)
+	System.err.println ("literal max error 1: " + itest);	
+    }
+    {
+      int itest = (int)(1.0/0.0);
+      if (itest != Integer.MAX_VALUE)
+	System.err.println ("literal max error 2" + itest);	
+    }
+    {
+      long ltest = (long)(1.0/0.0);
+      if (ltest != Long.MAX_VALUE)
+	System.err.println ("literal max error 3" + ltest);	
+    }
+    {
+      long ltest = (long)(float)(1.0/0.0);
+      if (ltest != Long.MAX_VALUE)
+	System.err.println ("literal max error 4" + ltest);	
+    }
+      
+    {
+      int itest = (int)(float)(-1.0/0.0);
+      if (itest != Integer.MIN_VALUE)
+	System.err.println ("literal min error 1: " + itest);	
+    }
+    {
+      int itest = (int)(-1.0/0.0);
+      if (itest != Integer.MIN_VALUE)
+	System.err.println ("literal min error 2" + itest);	
+    }
+    {
+      long ltest = (long)(-1.0/0.0);
+      if (ltest != Long.MIN_VALUE)
+	System.err.println ("literal min error 3" + ltest);	
+    }
+    {
+      long ltest = (long)(float)(-1.0/0.0);
+      if (ltest != Long.MIN_VALUE)
+	System.err.println ("literal min error 4" + ltest);	
+    }
+      
+    {
+      int itest = (int)(float)(zero/zero);
+      if (itest != 0)
+	System.err.println ("calc inf error 1: " + itest);	
+    }
+    {
+      int itest = (int)(zero/zero);
+      if (itest != 0)
+	System.err.println ("calc inf error 2" + itest);	
+    }
+    {
+      long ltest = (long)(zero/zero);
+      if (ltest != 0)
+	System.err.println ("calc inf error 3" + ltest);	
+    }
+    {
+      long ltest = (long)(float)(zero/zero);
+      if (ltest != 0)
+	System.err.println ("calc inf error 4" + ltest);	
+    }
+      
+    {
+      int itest = (int)(float)(1.0/zero);
+      if (itest != Integer.MAX_VALUE)
+	System.err.println ("calc max error 1: " + itest);	
+    }
+    {
+      int itest = (int)(1.0/zero);
+      if (itest != Integer.MAX_VALUE)
+	System.err.println ("calc max error 2" + itest);	
+    }
+    {
+      long ltest = (long)(1.0/zero);
+      if (ltest != Long.MAX_VALUE)
+	System.err.println ("calc max error 3" + ltest);	
+    }
+    {
+      long ltest = (long)(float)(1.0/zero);
+      if (ltest != Long.MAX_VALUE)
+	System.err.println ("calc max error 4" + ltest);	
+    }
+      
+    {
+      int itest = (int)(float)(-1.0/zero);
+      if (itest != Integer.MIN_VALUE)
+	System.err.println ("calc min error 1: " + itest);	
+    }
+    {
+      int itest = (int)(-1.0/zero);
+      if (itest != Integer.MIN_VALUE)
+	System.err.println ("calc min error 2" + itest);	
+    }
+    {
+      long ltest = (long)(-1.0/zero);
+      if (ltest != Long.MIN_VALUE)
+	System.err.println ("calc min error 3" + ltest);	
+    }
+    {
+      long ltest = (long)(float)(-1.0/zero);
+      if (ltest != Long.MIN_VALUE)
+	System.err.println ("calc min error 4" + ltest);	
+    }
+      
+  }
+}
diff --git a/libjava/testsuite/libjava.lang/Float_2.out b/libjava/testsuite/libjava.lang/Float_2.out
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391