working_even_better

darcs-hash:20040223204214-5007d-ee7e2ef746bf116e63dbf490cb41e6bfa915c226.gz

diff --git a/src/org/ibex/plat/GCJ.java b/src/org/ibex/plat/GCJ.java
index fa8ac9a..63fe878 100644 (file)
--- a/src/org/ibex/plat/GCJ.java
+++ b/src/org/ibex/plat/GCJ.java
@@ -12,15 +12,12 @@ public abstract class GCJ extends Platform {
 
     // static references to these classes ensure that the linker will include them
     public static Object c1 = new gnu.java.locale.Calendar();
-        //    public static Object[][] c1c = new gnu.java.locale.Calendar().getContents();
     public static Object c2 = new java.util.GregorianCalendar();
     public static Object c3n = new gnu.gcj.convert.Input_ASCII();
     public static Object c4 = new gnu.gcj.convert.Input_UTF8();
     public static Object c5 = new gnu.gcj.convert.Input_8859_1();
-    public static Object c6 = new gnu.java.locale.LocaleInformation();
     public static Object c7 = new gnu.gcj.convert.Output_ASCII();
-    //public static Object c8 = new gnu.java.locale.Calendar_en();
-    //public static Object c9 = new gnu.java.locale.Calendar_en_US();
+    public static Object c6 = new gnu.java.locale.LocaleInformation();
     public static Object c10 = new gnu.gcj.protocol.http.Handler();
     public static Object c11 = new gnu.gcj.protocol.jar.Handler();
     public static Object c12 = new java.security.cert.Certificate("foo") { 
@@ -31,7 +28,6 @@ public abstract class GCJ extends Platform {
             public PublicKey getPublicKey() { return null; }
         };
 
-
     protected native InputStream _getBuiltinInputStream();
 
     protected native void _decodeJPEG(InputStream is, Picture p);

diff --git a/src/org/ibex/util/BytecodePruner.java b/src/org/ibex/util/BytecodePruner.java
index 7c6d1fc..c579723 100644 (file)
--- a/src/org/ibex/util/BytecodePruner.java
+++ b/src/org/ibex/util/BytecodePruner.java
@@ -83,22 +83,9 @@ public class BytecodePruner {
         bcp.visitJavaClass(repo.loadClass("gnu.gcj.runtime.FinalizerThread"));
         bcp.visitJavaClass(repo.loadClass("gnu.gcj.runtime.FirstThread"));
 
-        /*
-        bcp.loadAllMethods("gnu.gcj.protocol.http.Handler");
-        bcp.loadAllMethods("gnu.gcj.protocol.file.Handler");
-        bcp.loadAllMethods("gnu.gcj.protocol.core.Handler");
-        bcp.loadAllMethods("gnu.gcj.protocol.jar.Handler");
-        bcp.loadAllMethods("gnu.gcj.convert.Input_UTF8");      // retrieved via reflection
-        bcp.loadAllMethods("gnu.gcj.convert.Output_UTF8");     // retrieved via reflection
-        bcp.loadAllMethods("gnu.gcj.convert.Input_8859_1");    // retrieved via reflection
-        bcp.loadAllMethods("gnu.gcj.convert.Output_8859_1");   // retrieved via reflection
-        bcp.loadAllMethods("gnu.gcj.convert.Input_ASCII");    // retrieved via reflection
-        bcp.loadAllMethods("gnu.gcj.convert.Output_ASCII");   // retrieved via reflection
         bcp.loadMethod("java.lang.Thread.run");                // we call start(), but the VM calls run()...
         bcp.loadMethod("java.lang.ref.Reference.enqueue");     // the GC calls this directly
         bcp.loadAllMethods("gnu.gcj.runtime.StringBuffer");    // the compiler emits calls directly to this class
-        */
-        // often called from native subclasses....
 
         bcp.loadAllMethods("java.util.Date");
         bcp.loadAllMethods("java.text.DateFormat");