2 files changed, 23 insertions, 2 deletions

diff --git a/libjava/java/lang/String.java b/libjava/java/lang/String.java
index 9937374f1bc..bc21afd0404 100644
--- a/libjava/java/lang/String.java
+++ b/libjava/java/lang/String.java
@@ -10,6 +10,7 @@ package java.lang;
 import java.io.UnsupportedEncodingException;
 import java.io.Serializable;
 import java.lang.Comparable;
+import java.util.Comparator;
 
 /**
  * @author Per Bothner <bothner@cygnus.com>
@@ -17,7 +18,7 @@ import java.lang.Comparable;
  */
 /* Written using "Java Class Libraries", 2nd edition, plus online
  * API docs for JDK 1.2 beta from http://www.javasoft.com.
- * Status:  Complete to 1.1, but see FIXMEs. Also see testsuite results.
+ * Status:  Complete to 1.3.
  */
 
 public final class String implements Serializable, Comparable
@@ -30,6 +31,14 @@ public final class String implements Serializable, Comparable
   // but it will avoid showing up as a discrepancy when comparing SUIDs.
   private static final long serialVersionUID = -6849794470754667710L;
 
+  static Comparator CASE_INSENSITIVE_ORDER = new Comparator()
+    {
+      public int compare (Object o1, Object o2)
+      {
+        return ((String) o1).compareToIgnoreCase ((String) o2);
+      }
+    };
+
   public String ()
   {
     init();
@@ -182,6 +191,12 @@ public final class String implements Serializable, Comparable
   {
     return compareTo ((String)obj);
   }
+  
+  public int compareToIgnoreCase (String str)
+  {
+    return this.toUpperCase().toLowerCase().compareTo(
+     str.toUpperCase().toLowerCase());
+  }  
 
   public native boolean regionMatches (int toffset,
 				       String other, int ooffset, int len);
diff --git a/libjava/java/lang/ThreadGroup.java b/libjava/java/lang/ThreadGroup.java
index f566e106f17..52c69525098 100644
--- a/libjava/java/lang/ThreadGroup.java
+++ b/libjava/java/lang/ThreadGroup.java
@@ -53,6 +53,9 @@ public class ThreadGroup
 {
   /* The Initial, top-level ThreadGroup. */
   static ThreadGroup root = new ThreadGroup();
+  /* This flag is set if an uncaught exception occurs. The runtime should 
+  check this and exit with an error status if it is set. */
+  static boolean had_uncaught_exception = false;
 
   private ThreadGroup parent;
   private String name;
@@ -496,7 +499,10 @@ public class ThreadGroup
     if (parent != null)
       parent.uncaughtException (thread, t);
     else if (! (t instanceof ThreadDeath))
-      t.printStackTrace();
+      {
+	t.printStackTrace();
+	had_uncaught_exception = true;
+      }
   }
 
   /** Tell the VM whether it may suspend Threads in low memory