This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Patch: FYI: libgcj / classpath comparison
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Cc: Gcc Patch List <gcc-patches at gcc dot gnu dot org>
- Date: 12 Jan 2002 11:53:23 -0700
- Subject: Patch: FYI: libgcj / classpath comparison
- Reply-to: tromey at redhat dot com
I'm checking this in.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* libgcj-classpath-compare.html: Rebuilt.
Index: libgcj-classpath-compare.html
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/libgcj-classpath-compare.html,v
retrieving revision 1.24
diff -u -r1.24 libgcj-classpath-compare.html
--- libgcj-classpath-compare.html 2001/12/16 22:43:30 1.24
+++ libgcj-classpath-compare.html 2002/01/12 18:38:17
@@ -9,7 +9,7 @@
cvs Classpath. It was generated using the <a
href="scripts/gen-classpath-compare"><code>gen-classpath-compare</code></a>
script on
-2001-12-16.
+2002-01-12.
This table intentionally omits certain classes which are not of
interest. If the third column shows a "Diff" link, then that means
the script believes that the class has been merged, but a difference
@@ -63,11 +63,8 @@
<tr> <td>java.net.InetAddress</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.net.JarURLConnection</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.net.MimeTypeMapper</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.net.MulticastSocket</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.net.MulticastSocket.diff">Diff</a></td> </tr>
<tr> <td>java.net.PlainDatagramSocketImpl</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.net.PlainSocketImpl</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.net.ServerSocket</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.net.Socket</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.net.SocketInputStream</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.net.SocketOutputStream</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.net.URL</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
Index: compare/java.io.ObjectInputStream.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.io.ObjectInputStream.diff,v
retrieving revision 1.3
diff -u -r1.3 java.io.ObjectInputStream.diff
--- compare/java.io.ObjectInputStream.diff 2001/12/16 00:16:06 1.3
+++ compare/java.io.ObjectInputStream.diff 2002/01/12 18:38:17
@@ -1,5 +1,5 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/io/ObjectInputStream.java Sat Dec 8 19:19:53 2001
-+++ java/io/ObjectInputStream.java Sat Dec 8 12:12:49 2001
+--- /home/tromey/gnu/egcs/classpath/classpath/java/io/ObjectInputStream.java Fri Dec 21 12:48:18 2001
++++ java/io/ObjectInputStream.java Fri Dec 21 15:56:48 2001
@@ -27,6 +27,8 @@
package java.io;
@@ -84,7 +84,7 @@
/**
Allows subclasses to resolve objects that are read from the
stream with other objects to be returned in their place. This
-@@ -560,21 +565,23 @@
+@@ -563,21 +568,23 @@
{
if (this.blockDataPosition >= this.blockDataBytes)
readNextBlock ();
@@ -111,7 +111,7 @@
return length;
}
else
-@@ -942,7 +949,7 @@
+@@ -945,7 +952,7 @@
de serialization mechanism provided by
<code>ObjectInputStream</code>. To make this method be used for
writing objects, subclasses must invoke the 0-argument
@@ -120,7 +120,7 @@
@see ObjectInputStream ()
*/
-@@ -1288,7 +1295,7 @@
+@@ -1291,7 +1298,7 @@
// returns a new instance of REAL_CLASS that has been constructed
@@ -129,7 +129,7 @@
private Object newObject (Class real_class, Class constructor_class)
{
try
-@@ -1326,34 +1333,182 @@
+@@ -1329,34 +1336,182 @@
// this native method is used to get access to the protected method
// of the same name in SecurityManger
@@ -332,7 +332,7 @@
private static final int BUFFER_SIZE = 1024;
private static final Class[] readObjectParams = { ObjectInputStream.class };
-@@ -1375,42 +1530,18 @@
+@@ -1378,42 +1533,18 @@
private boolean fieldsAlreadyRead;
private Vector validators;
Index: compare/java.io.ObjectOutputStream.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.io.ObjectOutputStream.diff,v
retrieving revision 1.2
diff -u -r1.2 java.io.ObjectOutputStream.diff
--- compare/java.io.ObjectOutputStream.diff 2001/09/26 17:37:43 1.2
+++ compare/java.io.ObjectOutputStream.diff 2002/01/12 18:38:17
@@ -1,5 +1,5 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/io/ObjectOutputStream.java Wed Sep 26 08:18:40 2001
-+++ java/io/ObjectOutputStream.java Sat Jan 27 12:55:12 2001
+--- /home/tromey/gnu/egcs/classpath/classpath/java/io/ObjectOutputStream.java Fri Dec 21 12:48:27 2001
++++ java/io/ObjectOutputStream.java Fri Dec 21 15:56:48 2001
@@ -35,7 +35,6 @@
import gnu.java.io.ObjectIdentityWrapper;
@@ -8,7 +8,7 @@
/**
An <code>ObjectOutputStream</code> can be used to write objects
-@@ -634,7 +633,7 @@
+@@ -637,7 +636,7 @@
/**
@see java.io.DataOutputStream#write (byte[])
*/
@@ -17,7 +17,7 @@
{
write (b, 0, b.length);
}
-@@ -643,7 +642,7 @@
+@@ -646,7 +645,7 @@
/**
@see java.io.DataOutputStream#write (byte[],int,int)
*/
@@ -26,7 +26,7 @@
{
if (writeDataAsBlocks)
{
-@@ -1174,18 +1173,179 @@
+@@ -1177,18 +1176,179 @@
}
@@ -217,7 +217,7 @@
// this value comes from 1.2 spec, but is used in 1.1 as well
private final static int BUFFER_SIZE = 1024;
-@@ -1208,13 +1368,4 @@
+@@ -1211,13 +1371,4 @@
private Hashtable OIDLookupTable;
private int protocolVersion;
private boolean useSubclassMethod;
Index: compare/java.lang.System.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.lang.System.diff,v
retrieving revision 1.2
diff -u -r1.2 java.lang.System.diff
--- compare/java.lang.System.diff 2001/09/26 17:37:43 1.2
+++ compare/java.lang.System.diff 2002/01/12 18:38:18
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/lang/System.java Wed Sep 26 08:18:40 2001
+--- /home/tromey/gnu/egcs/classpath/classpath/java/lang/System.java Tue Jan 8 17:08:15 2002
+++ java/lang/System.java Sat Sep 1 22:56:27 2001
-@@ -1,382 +1,252 @@
+@@ -1,436 +1,252 @@
-/* java.lang.System
- Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+// System.java - System-specific info.
@@ -548,9 +548,65 @@
- ** </ul>
- **/
- static void insertGNUProperties ()
+- {
+- properties.put ("gnu.cpu.endian",
+- (isWordsBigEndian ())? "big" : "little");
+-
+- // Common encoding aliases. See gnu.java.io.EncodingManager.
+- properties.put ("gnu.java.io.encoding_scheme_alias.ISO-8859-1", "8859_1");
+- properties.put ("gnu.java.io.encoding_scheme_alias.ISO-8859-2", "8859_2");
+- properties.put ("gnu.java.io.encoding_scheme_alias.ISO-8859-3", "8859_3");
+- properties.put ("gnu.java.io.encoding_scheme_alias.ISO-8859-4", "8859_4");
+- properties.put ("gnu.java.io.encoding_scheme_alias.ISO-8859-5", "8859_5");
+- properties.put ("gnu.java.io.encoding_scheme_alias.ISO-8859-6", "8859_6");
+- properties.put ("gnu.java.io.encoding_scheme_alias.ISO-8859-7", "8859_7");
+- properties.put ("gnu.java.io.encoding_scheme_alias.ISO-8859-8", "8859_8");
+- properties.put ("gnu.java.io.encoding_scheme_alias.ISO-8859-9", "8859_9");
+-
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso-8859-1", "8859_1");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso-8859-2", "8859_2");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso-8859-3", "8859_3");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso-8859-4", "8859_4");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso-8859-5", "8859_5");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso-8859-6", "8859_6");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso-8859-7", "8859_7");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso-8859-8", "8859_8");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso-8859-9", "8859_9");
+-
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso8859_1", "8859_1");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso8859_2", "8859_2");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso8859_3", "8859_3");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso8859_4", "8859_4");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso8859_5", "8859_5");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso8859_6", "8859_6");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso8859_7", "8859_7");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso8859_8", "8859_8");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso8859_9", "8859_9");
+-
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso-latin-1", "8859_1");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso-latin-2", "8859_2");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso-latin-3", "8859_3");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso-latin-4", "8859_4");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso-latin-5", "8859_5");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso-latin-6", "8859_6");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso-latin-7", "8859_7");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso-latin-8", "8859_8");
+- properties.put ("gnu.java.io.encoding_scheme_alias.iso-latin-9", "8859_9");
+-
+- properties.put ("gnu.java.io.encoding_scheme_alias.latin1", "8859_1");
+- properties.put ("gnu.java.io.encoding_scheme_alias.latin2", "8859_2");
+- properties.put ("gnu.java.io.encoding_scheme_alias.latin3", "8859_3");
+- properties.put ("gnu.java.io.encoding_scheme_alias.latin4", "8859_4");
+- properties.put ("gnu.java.io.encoding_scheme_alias.latin5", "8859_5");
+- properties.put ("gnu.java.io.encoding_scheme_alias.latin6", "8859_6");
+- properties.put ("gnu.java.io.encoding_scheme_alias.latin7", "8859_7");
+- properties.put ("gnu.java.io.encoding_scheme_alias.latin8", "8859_8");
+- properties.put ("gnu.java.io.encoding_scheme_alias.latin9", "8859_9");
+ // TODO 1.2.
+ // public static String mapLibraryName (String libname);
-+
+
+- properties.put ("gnu.java.io.encoding_scheme_alias.UTF-8", "UTF8");
+- properties.put ("gnu.java.io.encoding_scheme_alias.utf-8", "UTF8");
+ public static void setSecurityManager (SecurityManager s)
+ {
+ if (secman != null)
@@ -567,9 +623,7 @@
+
+ // Don't allow System objects to be made.
+ private System ()
- {
-- properties.put ("gnu.cpu.endian",
-- (isWordsBigEndian ())? "big" : "little");
++ {
}
- static native boolean isWordsBigEndian ();