Jumbo patch:

* Imported beans and serialization
* Updated IA-64 port
* Miscellaneous bug fixes

From-SVN: r34028

1 files changed, 400 insertions, 199 deletions

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 7038e2e..881731b 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -98,6 +98,7 @@ OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 RANLIB = @RANLIB@
+SYSDEP_SOURCES = @SYSDEP_SOURCES@
 SYSTEMSPEC = @SYSTEMSPEC@
 THREADDEPS = @THREADDEPS@
 THREADINCS = @THREADINCS@
@@ -138,6 +139,8 @@ data_DATA = libgcj.zip
 
 @NATIVE_TRUE@bin_PROGRAMS = \
 @NATIVE_TRUE@jv-convert gij
+
+bin_SCRIPTS = addr2name.awk
 @CANADIAN_TRUE@@NULL_TARGET_TRUE@GCJ = \
 @CANADIAN_TRUE@@NULL_TARGET_TRUE@gcj
 @CANADIAN_TRUE@@NULL_TARGET_FALSE@GCJ = \
@@ -229,7 +232,9 @@ SUFFIXES = .class .java .h
 
 nat_headers = $(ordinary_java_source_files:.java=.h) \
 	$(built_java_source_files:.java=.h) \
-	$(cond_awt_java_source_files:.java=.h)
+	$(cond_awt_java_source_files:.java=.h) \
+	java/io/ObjectOutputStream$$PutField.h \
+	java/io/ObjectInputStream$$GetField.h
 
 
 extra_headers = java/lang/Object.h java/lang/Class.h
@@ -293,23 +298,48 @@ gnu/gcj/convert/UnicodeToBytes.java
 special_java_source_files = java/lang/Class.java java/lang/Object.java
 
 awt_java_source_files = \
-java/awt/AWTError.java \
+java/awt/event/ActionEvent.java	\
+java/awt/event/ActionListener.java \
+java/awt/event/ComponentEvent.java \
+java/awt/event/KeyAdapter.java \
+java/awt/event/InputEvent.java \
+java/awt/event/KeyEvent.java \
+java/awt/event/KeyListener.java	\
+java/awt/event/TextEvent.java \
+java/awt/event/TextListener.java \
+java/awt/event/WindowAdapter.java \
+java/awt/event/WindowEvent.java	\
+java/awt/event/WindowListener.java \
+java/awt/event/InputMethodListener.java	\
+java/awt/event/ComponentListener.java \
+java/awt/event/AdjustmentListener.java \
+java/awt/event/AWTEventListener.java \
+java/awt/event/FocusListener.java \
+java/awt/event/AdjustmentEvent.java \
+java/awt/event/ItemListener.java \
+java/awt/event/ContainerListener.java \
+java/awt/event/MouseListener.java \
+java/awt/event/MouseMotionListener.java	\
+java/awt/event/ComponentAdapter.java \
+java/awt/event/ContainerAdapter.java \
+java/awt/event/FocusAdapter.java \
+java/awt/event/MouseAdapter.java \
+java/awt/event/MouseMotionAdapter.java \
+java/awt/event/FocusEvent.java \
+java/awt/event/InputMethodEvent.java \
+java/awt/event/MouseEvent.java \
+java/awt/event/ItemEvent.java \
+java/awt/event/InvocationEvent.java \
+java/awt/event/PaintEvent.java \
+java/awt/event/ContainerEvent.java \
 java/awt/AWTEvent.java \
-java/awt/AWTException.java \
-java/awt/ActiveEvent.java \
-java/awt/Adjustable.java \
 java/awt/BorderLayout.java \
-java/awt/Color.java \
 java/awt/Component.java	\
 java/awt/Container.java	\
 java/awt/Dimension.java	\
 java/awt/Event.java \
 java/awt/Font.java \
 java/awt/Frame.java \
-java/awt/Graphics.java \
-java/awt/IllegalComponentStateException.java \
-java/awt/Image.java \
-java/awt/ItemSelectable.java \
 java/awt/LayoutManager.java \
 java/awt/LayoutManager2.java \
 java/awt/Menu.java \
@@ -317,56 +347,31 @@ java/awt/MenuBar.java \
 java/awt/MenuComponent.java \
 java/awt/MenuContainer.java \
 java/awt/MenuItem.java \
-java/awt/Paint.java \
-java/awt/PaintContext.java \
 java/awt/Point.java \
-java/awt/Rectangle.java	\
+java/awt/AWTError.java \
 java/awt/Shape.java \
 java/awt/TextArea.java \
 java/awt/TextComponent.java \
 java/awt/Toolkit.java \
-java/awt/Transparency.java \
 java/awt/Window.java \
-java/awt/event/AWTEventListener.java \
-java/awt/event/ActionEvent.java	\
-java/awt/event/ActionListener.java \
-java/awt/event/AdjustmentEvent.java \
-java/awt/event/AdjustmentListener.java \
-java/awt/event/ComponentAdapter.java \
-java/awt/event/ComponentEvent.java \
-java/awt/event/ComponentListener.java \
-java/awt/event/ContainerAdapter.java \
-java/awt/event/ContainerEvent.java \
-java/awt/event/ContainerListener.java \
-java/awt/event/FocusAdapter.java \
-java/awt/event/FocusEvent.java \
-java/awt/event/FocusListener.java \
-java/awt/event/InputEvent.java \
-java/awt/event/InputMethodEvent.java \
-java/awt/event/InputMethodListener.java	\
-java/awt/event/InvocationEvent.java \
-java/awt/event/ItemEvent.java \
-java/awt/event/ItemListener.java \
-java/awt/event/KeyAdapter.java \
-java/awt/event/KeyEvent.java \
-java/awt/event/KeyListener.java	\
-java/awt/event/MouseAdapter.java \
-java/awt/event/MouseEvent.java \
-java/awt/event/MouseListener.java \
-java/awt/event/MouseMotionAdapter.java \
-java/awt/event/MouseMotionListener.java	\
-java/awt/event/PaintEvent.java \
-java/awt/event/TextEvent.java \
-java/awt/event/TextListener.java \
-java/awt/event/WindowAdapter.java \
-java/awt/event/WindowEvent.java	\
-java/awt/event/WindowListener.java \
 java/awt/geom/Dimension2D.java \
 java/awt/geom/Point2D.java \
 java/awt/peer/ComponentPeer.java \
 java/awt/peer/ContainerPeer.java \
 java/awt/peer/FramePeer.java \
-java/awt/peer/WindowPeer.java
+java/awt/peer/WindowPeer.java \
+java/awt/Adjustable.java \
+java/awt/Color.java \
+java/awt/Graphics.java \
+java/awt/Image.java \
+java/awt/Paint.java \
+java/awt/PaintContext.java \
+java/awt/Transparency.java \
+java/awt/ItemSelectable.java \
+java/awt/AWTException.java \
+java/awt/ActiveEvent.java \
+java/awt/Rectangle.java	\
+java/awt/IllegalComponentStateException.java
 
 @AWT_TRUE@cond_awt_java_source_files = \
 @AWT_TRUE@$(awt_java_source_files)
@@ -375,11 +380,12 @@ java/awt/peer/WindowPeer.java
 built_java_source_files = java/lang/ConcreteProcess.java
 
 ordinary_java_source_files = $(convert_source_files) \
-gnu/gcj/io/DefaultMimeTypes.java \
-gnu/gcj/io/MimeTypes.java \
-gnu/gcj/jni/NativeThread.java \
-gnu/gcj/runtime/VMClassLoader.java \
-gnu/gcj/runtime/FirstThread.java \
+gnu/gcj/protocol/http/Connection.java \
+gnu/gcj/protocol/http/Handler.java \
+gnu/gcj/protocol/file/Connection.java \
+gnu/gcj/protocol/file/Handler.java \
+gnu/gcj/protocol/jar/Connection.java \
+gnu/gcj/protocol/jar/Handler.java \
 gnu/gcj/text/BaseBreakIterator.java \
 gnu/gcj/text/CharacterBreakIterator.java \
 gnu/gcj/text/LineBreakIterator.java \
@@ -387,15 +393,36 @@ gnu/gcj/text/LocaleData_en.java	\
 gnu/gcj/text/LocaleData_en_US.java \
 gnu/gcj/text/SentenceBreakIterator.java	\
 gnu/gcj/text/WordBreakIterator.java \
-gnu/gcj/math/MPN.java \
-gnu/gcj/protocol/file/Connection.java \
-gnu/gcj/protocol/file/Handler.java \
-gnu/gcj/protocol/http/Connection.java \
-gnu/gcj/protocol/http/Handler.java \
-gnu/gcj/protocol/jar/Handler.java \
-gnu/gcj/protocol/jar/Connection.java \
-gnu/gcj/RawData.java \
 gnu/gcj/util/EnumerationChain.java \
+gnu/gcj/RawData.java \
+gnu/gcj/math/MPN.java \
+gnu/gcj/runtime/VMClassLoader.java \
+gnu/gcj/runtime/FirstThread.java \
+gnu/gcj/jni/NativeThread.java \
+gnu/gcj/io/DefaultMimeTypes.java \
+gnu/gcj/io/MimeTypes.java \
+gnu/gcj/io/SimpleSHSStream.java	\
+gnu/java/beans/editors/ColorEditor.java	\
+gnu/java/beans/editors/FontEditor.java \
+gnu/java/beans/editors/NativeBooleanEditor.java	\
+gnu/java/beans/editors/NativeByteEditor.java \
+gnu/java/beans/editors/NativeDoubleEditor.java \
+gnu/java/beans/editors/NativeFloatEditor.java \
+gnu/java/beans/editors/NativeIntEditor.java \
+gnu/java/beans/editors/NativeLongEditor.java \
+gnu/java/beans/editors/NativeShortEditor.java \
+gnu/java/beans/editors/StringEditor.java \
+gnu/java/beans/info/ComponentBeanInfo.java \
+gnu/java/beans/BeanInfoEmbryo.java \
+gnu/java/beans/EmptyBeanInfo.java \
+gnu/java/beans/ExplicitBeanInfo.java \
+gnu/java/beans/IntrospectionIncubator.java \
+gnu/java/io/ClassLoaderObjectInputStream.java \
+gnu/java/io/NullOutputStream.java \
+gnu/java/io/ObjectIdentityWrapper.java \
+gnu/java/lang/reflect/TypeSignature.java \
+gnu/java/lang/ArrayHelper.java \
+gnu/java/lang/ClassHelper.java \
 java/io/BufferedInputStream.java \
 java/io/BufferedOutputStream.java \
 java/io/BufferedReader.java \
@@ -411,7 +438,6 @@ java/io/DataOutput.java	\
 java/io/DataOutputStream.java \
 java/io/EOFException.java \
 java/io/File.java \
-java/io/FileDescriptor.java \
 java/io/FileInputStream.java \
 java/io/FileNotFoundException.java \
 java/io/FileOutputStream.java \
@@ -428,11 +454,10 @@ java/io/InputStreamReader.java \
 java/io/InterruptedIOException.java \
 java/io/LineNumberInputStream.java \
 java/io/LineNumberReader.java \
-java/io/ObjectStreamException.java \
-java/io/OptionalDataException.java \
 java/io/OutputStream.java \
 java/io/OutputStreamWriter.java	\
-java/io/PipedInputStream.java \
+java/io/Externalizable.java \
+java/io/FileDescriptor.java \
 java/io/PipedOutputStream.java \
 java/io/PipedReader.java \
 java/io/PipedWriter.java \
@@ -444,7 +469,6 @@ java/io/RandomAccessFile.java \
 java/io/Reader.java \
 java/io/SequenceInputStream.java \
 java/io/Serializable.java \
-java/io/StreamCorruptedException.java \
 java/io/StreamTokenizer.java \
 java/io/StringBufferInputStream.java \
 java/io/StringReader.java \
@@ -453,6 +477,35 @@ java/io/SyncFailedException.java \
 java/io/UTFDataFormatException.java \
 java/io/UnsupportedEncodingException.java \
 java/io/Writer.java \
+java/io/ObjectStreamException.java \
+java/io/OptionalDataException.java \
+java/io/StreamCorruptedException.java \
+java/io/BlockDataException.java	\
+java/io/InvalidClassException.java \
+java/io/InvalidObjectException.java \
+java/io/NotActiveException.java	\
+java/io/NotSerializableException.java \
+java/io/ObjectInput.java \
+java/io/ObjectInputStream.java \
+java/io/ObjectInputValidation.java \
+java/io/ObjectOutput.java \
+java/io/ObjectOutputStream.java	\
+java/io/ObjectStreamClass.java \
+java/io/ObjectStreamConstants.java \
+java/io/ObjectStreamField.java \
+java/io/Replaceable.java \
+java/io/Resolvable.java	\
+java/io/SerializablePermission.java \
+java/io/WriteAbortedException.java \
+java/io/PipedInputStream.java \
+java/lang/reflect/Constructor.java \
+java/lang/reflect/AccessibleObject.java	\
+java/lang/reflect/Array.java \
+java/lang/reflect/Method.java \
+java/lang/reflect/Field.java \
+java/lang/reflect/InvocationTargetException.java \
+java/lang/reflect/Member.java \
+java/lang/reflect/Modifier.java	\
 java/lang/AbstractMethodError.java \
 java/lang/ArithmeticException.java \
 java/lang/ArrayIndexOutOfBoundsException.java \
@@ -481,10 +534,10 @@ java/lang/IllegalMonitorStateException.java \
 java/lang/IllegalStateException.java \
 java/lang/IllegalThreadStateException.java \
 java/lang/IncompatibleClassChangeError.java \
-java/lang/IndexOutOfBoundsException.java \
 java/lang/InstantiationError.java \
-java/lang/InstantiationException.java \
 java/lang/Integer.java \
+java/lang/IndexOutOfBoundsException.java \
+java/lang/InstantiationException.java \
 java/lang/InternalError.java \
 java/lang/InterruptedException.java \
 java/lang/LinkageError.java \
@@ -522,107 +575,42 @@ java/lang/UnsupportedOperationException.java \
 java/lang/VerifyError.java \
 java/lang/VirtualMachineError.java \
 java/lang/Void.java \
-java/lang/reflect/AccessibleObject.java	\
-java/lang/reflect/Array.java \
-java/lang/reflect/Constructor.java \
-java/lang/reflect/Field.java \
-java/lang/reflect/InvocationTargetException.java \
-java/lang/reflect/Member.java \
-java/lang/reflect/Method.java \
-java/lang/reflect/Modifier.java	\
-java/math/BigDecimal.java \
-java/math/BigInteger.java \
 java/net/BindException.java \
 java/net/ConnectException.java \
 java/net/ContentHandler.java \
 java/net/ContentHandlerFactory.java \
-java/net/DatagramPacket.java \
-java/net/DatagramSocket.java \
-java/net/DatagramSocketImpl.java \
 java/net/FileNameMap.java \
-java/net/HttpURLConnection.java \
+java/net/HttpURLConnection.java	\
 java/net/InetAddress.java \
-java/net/JarURLConnection.java \
 java/net/MalformedURLException.java \
-java/net/MulticastSocket.java \
 java/net/NoRouteToHostException.java \
-java/net/PlainDatagramSocketImpl.java \
 java/net/PlainSocketImpl.java \
 java/net/ProtocolException.java	\
 java/net/ServerSocket.java \
+java/net/URL.java \
 java/net/Socket.java \
 java/net/SocketException.java \
 java/net/SocketImpl.java \
 java/net/SocketImplFactory.java	\
-java/net/SocketOptions.java \
-java/net/URL.java \
-java/net/URLClassLoader.java \
 java/net/URLConnection.java \
-java/net/URLDecoder.java \
-java/net/URLEncoder.java \
 java/net/URLStreamHandler.java \
 java/net/URLStreamHandlerFactory.java \
 java/net/UnknownHostException.java \
 java/net/UnknownServiceException.java \
-java/security/AlgorithmParameterGeneratorSpi.java \
-java/security/DigestException.java \
-java/security/GeneralSecurityException.java \
-java/security/InvalidAlgorithmParameterException.java \
-java/security/InvalidKeyException.java \
-java/security/InvalidParameterException.java \
-java/security/Key.java \
-java/security/KeyException.java \
-java/security/KeyPair.java \
-java/security/KeyPairGenerator.java \
-java/security/KeyPairGeneratorSpi.java \
-java/security/MessageDigest.java \
-java/security/NoSuchAlgorithmException.java \
-java/security/NoSuchProviderException.java \
-java/security/PrivateKey.java \
-java/security/Provider.java \
-java/security/PublicKey.java \
-java/security/SecureClassLoader.java \
-java/security/SecureRandom.java \
-java/security/Security.java \
-java/security/Signature.java \
-java/security/SignatureException.java \
-java/security/interfaces/DSAKey.java \
-java/security/interfaces/DSAParams.java \
-java/security/interfaces/DSAPrivateKey.java \
-java/security/interfaces/DSAPublicKey.java \
-java/security/interfaces/RSAPrivateCrtKey.java \
-java/security/interfaces/RSAPrivateKey.java \
-java/security/interfaces/RSAPublicKey.java \
-java/security/spec/AlgorithmParameterSpec.java \
-java/security/spec/InvalidKeySpecException.java \
-java/security/spec/InvalidParameterSpecException.java \
-java/security/spec/KeySpec.java \
-java/security/spec/RSAPrivateCrtKeySpec.java \
-java/security/spec/RSAPrivateKeySpec.java \
-java/security/spec/RSAPublicKeySpec.java \
-java/sql/CallableStatement.java \
-java/sql/Connection.java \
-java/sql/DataTruncation.java \
-java/sql/DatabaseMetaData.java \
-java/sql/Date.java \
-java/sql/Driver.java \
-java/sql/DriverManager.java \
-java/sql/DriverPropertyInfo.java \
-java/sql/PreparedStatement.java \
-java/sql/ResultSet.java \
-java/sql/ResultSetMetaData.java \
-java/sql/SQLException.java \
-java/sql/SQLWarning.java \
-java/sql/Statement.java \
-java/sql/Time.java \
-java/sql/Timestamp.java \
-java/sql/Types.java \
+java/net/URLDecoder.java \
+java/net/URLEncoder.java \
+java/net/DatagramPacket.java \
+java/net/DatagramSocket.java \
+java/net/DatagramSocketImpl.java \
+java/net/MulticastSocket.java \
+java/net/PlainDatagramSocketImpl.java \
+java/net/SocketOptions.java \
+java/net/JarURLConnection.java \
+java/net/URLClassLoader.java \
+java/text/Collator.java	\
 java/text/BreakIterator.java \
 java/text/CharacterIterator.java \
 java/text/ChoiceFormat.java \
-java/text/CollationElementIterator.java \
-java/text/CollationKey.java \
-java/text/Collator.java \
 java/text/DateFormat.java \
 java/text/DateFormatSymbols.java \
 java/text/DecimalFormat.java \
@@ -633,13 +621,34 @@ java/text/MessageFormat.java \
 java/text/NumberFormat.java \
 java/text/ParseException.java \
 java/text/ParsePosition.java \
-java/text/RuleBasedCollator.java \
 java/text/SimpleDateFormat.java	\
 java/text/StringCharacterIterator.java \
+java/text/CollationElementIterator.java	\
+java/text/CollationKey.java \
+java/text/RuleBasedCollator.java \
+java/util/zip/Adler32.java \
+java/util/zip/CRC32.java \
+java/util/zip/Checksum.java \
+java/util/zip/Deflater.java \
+java/util/zip/DeflaterOutputStream.java	\
+java/util/zip/ZipConstants.java	\
+java/util/zip/ZipEntry.java \
+java/util/zip/ZipException.java	\
+java/util/zip/ZipFile.java \
+java/util/zip/ZipOutputStream.java \
+java/util/zip/InflaterInputStream.java \
+java/util/zip/ZipInputStream.java \
+java/util/zip/DataFormatException.java \
+java/util/zip/CheckedInputStream.java \
+java/util/zip/CheckedOutputStream.java \
+java/util/zip/Inflater.java \
+java/util/zip/GZIPInputStream.java \
+java/util/zip/GZIPOutputStream.java \
+java/util/jar/JarEntry.java \
+java/util/jar/JarFile.java \
+java/util/jar/JarInputStream.java \
 java/util/BitSet.java \
 java/util/Calendar.java	\
-java/util/Collection.java \
-java/util/Comparator.java \
 java/util/ConcurrentModificationException.java \
 java/util/Date.java \
 java/util/Dictionary.java \
@@ -649,9 +658,6 @@ java/util/EventListener.java \
 java/util/EventObject.java \
 java/util/GregorianCalendar.java \
 java/util/Hashtable.java \
-java/util/Iterator.java \
-java/util/List.java \
-java/util/ListIterator.java \
 java/util/ListResourceBundle.java \
 java/util/Locale.java \
 java/util/MissingResourceException.java	\
@@ -659,7 +665,6 @@ java/util/NoSuchElementException.java \
 java/util/Observable.java \
 java/util/Observer.java	\
 java/util/Properties.java \
-java/util/PropertyResourceBundle.java \
 java/util/Random.java \
 java/util/ResourceBundle.java \
 java/util/SimpleTimeZone.java \
@@ -668,27 +673,115 @@ java/util/StringTokenizer.java \
 java/util/TimeZone.java	\
 java/util/TooManyListenersException.java \
 java/util/Vector.java \
-java/util/jar/JarFile.java \
-java/util/jar/JarInputStream.java \
-java/util/jar/JarEntry.java \
-java/util/zip/Adler32.java \
-java/util/zip/CRC32.java \
-java/util/zip/CheckedInputStream.java \
-java/util/zip/CheckedOutputStream.java \
-java/util/zip/Checksum.java \
-java/util/zip/DataFormatException.java \
-java/util/zip/Deflater.java \
-java/util/zip/DeflaterOutputStream.java	\
-java/util/zip/GZIPInputStream.java \
-java/util/zip/GZIPOutputStream.java \
-java/util/zip/Inflater.java \
-java/util/zip/InflaterInputStream.java	\
-java/util/zip/ZipConstants.java	\
-java/util/zip/ZipEntry.java \
-java/util/zip/ZipException.java	\
-java/util/zip/ZipFile.java \
-java/util/zip/ZipInputStream.java \
-java/util/zip/ZipOutputStream.java
+java/util/List.java \
+java/util/Collection.java \
+java/util/Comparator.java \
+java/util/Iterator.java	\
+java/util/PropertyResourceBundle.java \
+java/util/Arrays.java \
+java/util/ListIterator.java \
+java/util/AbstractCollection.java \
+java/util/AbstractList.java \
+java/security/MessageDigest.java \
+java/security/NoSuchAlgorithmException.java \
+java/security/SecureClassLoader.java \
+java/security/interfaces/DSAKey.java \
+java/security/interfaces/DSAParams.java	\
+java/security/interfaces/DSAPrivateKey.java \
+java/security/interfaces/DSAPublicKey.java \
+java/security/interfaces/RSAPrivateCrtKey.java \
+java/security/interfaces/RSAPrivateKey.java \
+java/security/interfaces/RSAPublicKey.java \
+java/security/AlgorithmParameterGeneratorSpi.java \
+java/security/DigestException.java \
+java/security/GeneralSecurityException.java \
+java/security/InvalidAlgorithmParameterException.java \
+java/security/InvalidKeyException.java \
+java/security/InvalidParameterException.java \
+java/security/Key.java \
+java/security/KeyException.java	\
+java/security/KeyPair.java \
+java/security/KeyPairGenerator.java \
+java/security/KeyPairGeneratorSpi.java \
+java/security/NoSuchProviderException.java \
+java/security/PrivateKey.java \
+java/security/Provider.java \
+java/security/PublicKey.java \
+java/security/SecureRandom.java	\
+java/security/Security.java \
+java/security/Signature.java \
+java/security/SignatureException.java \
+java/security/spec/AlgorithmParameterSpec.java \
+java/security/spec/InvalidKeySpecException.java	\
+java/security/spec/InvalidParameterSpecException.java \
+java/security/spec/KeySpec.java	\
+java/security/spec/RSAPrivateCrtKeySpec.java \
+java/security/spec/RSAPrivateKeySpec.java \
+java/security/spec/RSAPublicKeySpec.java \
+java/security/BasicPermission.java \
+java/security/Guard.java \
+java/security/DigestOutputStream.java \
+java/security/Permission.java \
+java/security/PermissionCollection.java	\
+java/math/BigDecimal.java \
+java/math/BigInteger.java \
+java/sql/CallableStatement.java	\
+java/sql/Connection.java \
+java/sql/DataTruncation.java \
+java/sql/DatabaseMetaData.java \
+java/sql/Date.java \
+java/sql/Driver.java \
+java/sql/DriverManager.java \
+java/sql/DriverPropertyInfo.java \
+java/sql/PreparedStatement.java	\
+java/sql/ResultSet.java	\
+java/sql/ResultSetMetaData.java	\
+java/sql/SQLException.java \
+java/sql/SQLWarning.java \
+java/sql/Statement.java	\
+java/sql/Time.java \
+java/sql/Timestamp.java	\
+java/sql/Types.java \
+java/beans/beancontext/BeanContext.java	\
+java/beans/beancontext/BeanContextChild.java \
+java/beans/beancontext/BeanContextChildComponentProxy.java \
+java/beans/beancontext/BeanContextChildSupport.java \
+java/beans/beancontext/BeanContextContainerProxy.java \
+java/beans/beancontext/BeanContextEvent.java \
+java/beans/beancontext/BeanContextMembershipEvent.java \
+java/beans/beancontext/BeanContextMembershipListener.java \
+java/beans/beancontext/BeanContextProxy.java \
+java/beans/beancontext/BeanContextServiceAvailableEvent.java \
+java/beans/beancontext/BeanContextServiceProvider.java \
+java/beans/beancontext/BeanContextServiceProviderBeanInfo.java \
+java/beans/beancontext/BeanContextServiceRevokedEvent.java \
+java/beans/beancontext/BeanContextServiceRevokedListener.java \
+java/beans/beancontext/BeanContextServices.java	\
+java/beans/beancontext/BeanContextServicesListener.java	\
+java/beans/BeanDescriptor.java \
+java/beans/BeanInfo.java \
+java/beans/Beans.java \
+java/beans/Customizer.java \
+java/beans/DesignMode.java \
+java/beans/EventSetDescriptor.java \
+java/beans/FeatureDescriptor.java \
+java/beans/IndexedPropertyDescriptor.java \
+java/beans/IntrospectionException.java \
+java/beans/Introspector.java \
+java/beans/MethodDescriptor.java \
+java/beans/ParameterDescriptor.java \
+java/beans/PropertyChangeEvent.java \
+java/beans/PropertyChangeListener.java \
+java/beans/PropertyChangeSupport.java \
+java/beans/PropertyDescriptor.java \
+java/beans/PropertyEditor.java \
+java/beans/PropertyEditorManager.java \
+java/beans/PropertyEditorSupport.java \
+java/beans/PropertyVetoException.java \
+java/beans/SimpleBeanInfo.java \
+java/beans/VetoableChangeListener.java \
+java/beans/VetoableChangeSupport.java \
+java/beans/Visibility.java
 
 
 java_source_files = $(ordinary_java_source_files) $(special_java_source_files)
@@ -720,10 +813,14 @@ gnu/gcj/convert/natInput_EUCJIS.cc \
 gnu/gcj/convert/natInput_SJIS.cc \
 gnu/gcj/convert/natOutput_EUCJIS.cc \
 gnu/gcj/convert/natOutput_SJIS.cc \
+gnu/gcj/io/natSimpleSHSStream.cc \
+gnu/gcj/io/shs.cc \
 gnu/gcj/jni/natNativeThread.cc \
 gnu/gcj/runtime/natFirstThread.cc \
 java/io/natFile.cc \
 java/io/natFileDescriptor.cc \
+java/io/natObjectInputStream.cc \
+java/io/natObjectOutputStream.cc \
 java/lang/natCharacter.cc \
 java/lang/natClass.cc \
 java/lang/natClassLoader.cc \
@@ -800,8 +897,6 @@ MULTIDIRS =
 MULTISUBDIR = 
 MULTIDO = true
 MULTICLEAN = true
-
-cygnus_hack = 
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = ./include/config.h
@@ -829,6 +924,8 @@ jv_convert_OBJECTS =
 gij_OBJECTS =  gij.o
 gen_from_JIS_OBJECTS = 
 gen_from_JIS_LDFLAGS = 
+SCRIPTS =  $(bin_SCRIPTS)
+
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -868,8 +965,8 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/gnu/gcj/convert/Output_iconv.P \
 .deps/gnu/gcj/convert/UnicodeToBytes.P \
 .deps/gnu/gcj/io/DefaultMimeTypes.P .deps/gnu/gcj/io/MimeTypes.P \
-.deps/gnu/gcj/jni/NativeThread.P .deps/gnu/gcj/math/MPN.P \
-.deps/gnu/gcj/protocol/file/Connection.P \
+.deps/gnu/gcj/io/SimpleSHSStream.P .deps/gnu/gcj/jni/NativeThread.P \
+.deps/gnu/gcj/math/MPN.P .deps/gnu/gcj/protocol/file/Connection.P \
 .deps/gnu/gcj/protocol/file/Handler.P \
 .deps/gnu/gcj/protocol/http/Connection.P \
 .deps/gnu/gcj/protocol/http/Handler.P \
@@ -884,7 +981,27 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/gnu/gcj/text/LocaleData_en_US.P \
 .deps/gnu/gcj/text/SentenceBreakIterator.P \
 .deps/gnu/gcj/text/WordBreakIterator.P \
-.deps/gnu/gcj/util/EnumerationChain.P .deps/interpret.P \
+.deps/gnu/gcj/util/EnumerationChain.P \
+.deps/gnu/java/beans/BeanInfoEmbryo.P \
+.deps/gnu/java/beans/EmptyBeanInfo.P \
+.deps/gnu/java/beans/ExplicitBeanInfo.P \
+.deps/gnu/java/beans/IntrospectionIncubator.P \
+.deps/gnu/java/beans/editors/ColorEditor.P \
+.deps/gnu/java/beans/editors/FontEditor.P \
+.deps/gnu/java/beans/editors/NativeBooleanEditor.P \
+.deps/gnu/java/beans/editors/NativeByteEditor.P \
+.deps/gnu/java/beans/editors/NativeDoubleEditor.P \
+.deps/gnu/java/beans/editors/NativeFloatEditor.P \
+.deps/gnu/java/beans/editors/NativeIntEditor.P \
+.deps/gnu/java/beans/editors/NativeLongEditor.P \
+.deps/gnu/java/beans/editors/NativeShortEditor.P \
+.deps/gnu/java/beans/editors/StringEditor.P \
+.deps/gnu/java/beans/info/ComponentBeanInfo.P \
+.deps/gnu/java/io/ClassLoaderObjectInputStream.P \
+.deps/gnu/java/io/NullOutputStream.P \
+.deps/gnu/java/io/ObjectIdentityWrapper.P \
+.deps/gnu/java/lang/ArrayHelper.P .deps/gnu/java/lang/ClassHelper.P \
+.deps/gnu/java/lang/reflect/TypeSignature.P .deps/interpret.P \
 .deps/java/awt/AWTError.P .deps/java/awt/AWTEvent.P \
 .deps/java/awt/AWTException.P .deps/java/awt/ActiveEvent.P \
 .deps/java/awt/Adjustable.P .deps/java/awt/BorderLayout.P \
@@ -930,37 +1047,83 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/awt/event/WindowListener.P .deps/java/awt/geom/Dimension2D.P \
 .deps/java/awt/geom/Point2D.P .deps/java/awt/peer/ComponentPeer.P \
 .deps/java/awt/peer/ContainerPeer.P .deps/java/awt/peer/FramePeer.P \
-.deps/java/awt/peer/WindowPeer.P .deps/java/io/BufferedInputStream.P \
+.deps/java/awt/peer/WindowPeer.P .deps/java/beans/BeanDescriptor.P \
+.deps/java/beans/BeanInfo.P .deps/java/beans/Beans.P \
+.deps/java/beans/Customizer.P .deps/java/beans/DesignMode.P \
+.deps/java/beans/EventSetDescriptor.P \
+.deps/java/beans/FeatureDescriptor.P \
+.deps/java/beans/IndexedPropertyDescriptor.P \
+.deps/java/beans/IntrospectionException.P \
+.deps/java/beans/Introspector.P .deps/java/beans/MethodDescriptor.P \
+.deps/java/beans/ParameterDescriptor.P \
+.deps/java/beans/PropertyChangeEvent.P \
+.deps/java/beans/PropertyChangeListener.P \
+.deps/java/beans/PropertyChangeSupport.P \
+.deps/java/beans/PropertyDescriptor.P .deps/java/beans/PropertyEditor.P \
+.deps/java/beans/PropertyEditorManager.P \
+.deps/java/beans/PropertyEditorSupport.P \
+.deps/java/beans/PropertyVetoException.P \
+.deps/java/beans/SimpleBeanInfo.P \
+.deps/java/beans/VetoableChangeListener.P \
+.deps/java/beans/VetoableChangeSupport.P .deps/java/beans/Visibility.P \
+.deps/java/beans/beancontext/BeanContext.P \
+.deps/java/beans/beancontext/BeanContextChild.P \
+.deps/java/beans/beancontext/BeanContextChildComponentProxy.P \
+.deps/java/beans/beancontext/BeanContextChildSupport.P \
+.deps/java/beans/beancontext/BeanContextContainerProxy.P \
+.deps/java/beans/beancontext/BeanContextEvent.P \
+.deps/java/beans/beancontext/BeanContextMembershipEvent.P \
+.deps/java/beans/beancontext/BeanContextMembershipListener.P \
+.deps/java/beans/beancontext/BeanContextProxy.P \
+.deps/java/beans/beancontext/BeanContextServiceAvailableEvent.P \
+.deps/java/beans/beancontext/BeanContextServiceProvider.P \
+.deps/java/beans/beancontext/BeanContextServiceProviderBeanInfo.P \
+.deps/java/beans/beancontext/BeanContextServiceRevokedEvent.P \
+.deps/java/beans/beancontext/BeanContextServiceRevokedListener.P \
+.deps/java/beans/beancontext/BeanContextServices.P \
+.deps/java/beans/beancontext/BeanContextServicesListener.P \
+.deps/java/io/BlockDataException.P .deps/java/io/BufferedInputStream.P \
 .deps/java/io/BufferedOutputStream.P .deps/java/io/BufferedReader.P \
 .deps/java/io/BufferedWriter.P .deps/java/io/ByteArrayInputStream.P \
 .deps/java/io/ByteArrayOutputStream.P .deps/java/io/CharArrayReader.P \
 .deps/java/io/CharArrayWriter.P .deps/java/io/CharConversionException.P \
 .deps/java/io/DataInput.P .deps/java/io/DataInputStream.P \
 .deps/java/io/DataOutput.P .deps/java/io/DataOutputStream.P \
-.deps/java/io/EOFException.P .deps/java/io/File.P \
-.deps/java/io/FileDescriptor.P .deps/java/io/FileInputStream.P \
-.deps/java/io/FileNotFoundException.P .deps/java/io/FileOutputStream.P \
-.deps/java/io/FileReader.P .deps/java/io/FileWriter.P \
-.deps/java/io/FilenameFilter.P .deps/java/io/FilterInputStream.P \
-.deps/java/io/FilterOutputStream.P .deps/java/io/FilterReader.P \
-.deps/java/io/FilterWriter.P .deps/java/io/IOException.P \
-.deps/java/io/InputStream.P .deps/java/io/InputStreamReader.P \
+.deps/java/io/EOFException.P .deps/java/io/Externalizable.P \
+.deps/java/io/File.P .deps/java/io/FileDescriptor.P \
+.deps/java/io/FileInputStream.P .deps/java/io/FileNotFoundException.P \
+.deps/java/io/FileOutputStream.P .deps/java/io/FileReader.P \
+.deps/java/io/FileWriter.P .deps/java/io/FilenameFilter.P \
+.deps/java/io/FilterInputStream.P .deps/java/io/FilterOutputStream.P \
+.deps/java/io/FilterReader.P .deps/java/io/FilterWriter.P \
+.deps/java/io/IOException.P .deps/java/io/InputStream.P \
+.deps/java/io/InputStreamReader.P \
 .deps/java/io/InterruptedIOException.P \
+.deps/java/io/InvalidClassException.P \
+.deps/java/io/InvalidObjectException.P \
 .deps/java/io/LineNumberInputStream.P .deps/java/io/LineNumberReader.P \
-.deps/java/io/ObjectStreamException.P \
+.deps/java/io/NotActiveException.P \
+.deps/java/io/NotSerializableException.P .deps/java/io/ObjectInput.P \
+.deps/java/io/ObjectInputStream.P .deps/java/io/ObjectInputValidation.P \
+.deps/java/io/ObjectOutput.P .deps/java/io/ObjectOutputStream.P \
+.deps/java/io/ObjectStreamClass.P .deps/java/io/ObjectStreamConstants.P \
+.deps/java/io/ObjectStreamException.P .deps/java/io/ObjectStreamField.P \
 .deps/java/io/OptionalDataException.P .deps/java/io/OutputStream.P \
 .deps/java/io/OutputStreamWriter.P .deps/java/io/PipedInputStream.P \
 .deps/java/io/PipedOutputStream.P .deps/java/io/PipedReader.P \
 .deps/java/io/PipedWriter.P .deps/java/io/PrintStream.P \
 .deps/java/io/PrintWriter.P .deps/java/io/PushbackInputStream.P \
 .deps/java/io/PushbackReader.P .deps/java/io/RandomAccessFile.P \
-.deps/java/io/Reader.P .deps/java/io/SequenceInputStream.P \
-.deps/java/io/Serializable.P .deps/java/io/StreamCorruptedException.P \
+.deps/java/io/Reader.P .deps/java/io/Replaceable.P \
+.deps/java/io/Resolvable.P .deps/java/io/SequenceInputStream.P \
+.deps/java/io/Serializable.P .deps/java/io/SerializablePermission.P \
+.deps/java/io/StreamCorruptedException.P \
 .deps/java/io/StreamTokenizer.P .deps/java/io/StringBufferInputStream.P \
 .deps/java/io/StringReader.P .deps/java/io/StringWriter.P \
 .deps/java/io/SyncFailedException.P \
 .deps/java/io/UTFDataFormatException.P \
-.deps/java/io/UnsupportedEncodingException.P .deps/java/io/Writer.P \
+.deps/java/io/UnsupportedEncodingException.P \
+.deps/java/io/WriteAbortedException.P .deps/java/io/Writer.P \
 .deps/java/lang/AbstractMethodError.P \
 .deps/java/lang/ArithmeticException.P \
 .deps/java/lang/ArrayIndexOutOfBoundsException.P \
@@ -1054,8 +1217,11 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/net/UnknownHostException.P \
 .deps/java/net/UnknownServiceException.P \
 .deps/java/security/AlgorithmParameterGeneratorSpi.P \
+.deps/java/security/BasicPermission.P \
 .deps/java/security/DigestException.P \
+.deps/java/security/DigestOutputStream.P \
 .deps/java/security/GeneralSecurityException.P \
+.deps/java/security/Guard.P \
 .deps/java/security/InvalidAlgorithmParameterException.P \
 .deps/java/security/InvalidKeyException.P \
 .deps/java/security/InvalidParameterException.P \
@@ -1065,6 +1231,8 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/security/MessageDigest.P \
 .deps/java/security/NoSuchAlgorithmException.P \
 .deps/java/security/NoSuchProviderException.P \
+.deps/java/security/Permission.P \
+.deps/java/security/PermissionCollection.P \
 .deps/java/security/PrivateKey.P .deps/java/security/Provider.P \
 .deps/java/security/PublicKey.P .deps/java/security/SecureClassLoader.P \
 .deps/java/security/SecureRandom.P .deps/java/security/Security.P \
@@ -1102,7 +1270,9 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/text/MessageFormat.P .deps/java/text/NumberFormat.P \
 .deps/java/text/ParseException.P .deps/java/text/ParsePosition.P \
 .deps/java/text/RuleBasedCollator.P .deps/java/text/SimpleDateFormat.P \
-.deps/java/text/StringCharacterIterator.P .deps/java/util/BitSet.P \
+.deps/java/text/StringCharacterIterator.P \
+.deps/java/util/AbstractCollection.P .deps/java/util/AbstractList.P \
+.deps/java/util/Arrays.P .deps/java/util/BitSet.P \
 .deps/java/util/Calendar.P .deps/java/util/Collection.P \
 .deps/java/util/Comparator.P \
 .deps/java/util/ConcurrentModificationException.P \
@@ -1335,6 +1505,25 @@ gij$(EXEEXT): $(gij_OBJECTS) $(gij_DEPENDENCIES)
 gen-from-JIS$(EXEEXT): $(gen_from_JIS_OBJECTS) $(gen_from_JIS_DEPENDENCIES)
 	@rm -f gen-from-JIS$(EXEEXT)
 	$(LINK) $(gen_from_JIS_LDFLAGS) $(gen_from_JIS_OBJECTS) $(gen_from_JIS_LDADD) $(LIBS)
+
+install-binSCRIPTS: $(bin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+	  else if test -f $(srcdir)/$$p; then \
+	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+	  else :; fi; fi; \
+	done
+
+uninstall-binSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	list='$(bin_SCRIPTS)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+	done
 .cc.o:
 	$(CXXCOMPILE) -c $<
 .cc.lo:
@@ -1593,7 +1782,7 @@ install-info-am:
 install-info: install-info-recursive
 install-exec-am: install-toolexeclibLIBRARIES \
 		install-toolexeclibLTLIBRARIES install-binPROGRAMS \
-		install-toolexeclibDATA
+		install-binSCRIPTS install-toolexeclibDATA
 install-exec: install-exec-recursive
 
 install-data-am: install-dataDATA install-data-local
@@ -1604,9 +1793,11 @@ install-am: all-am
 install: install-recursive
 uninstall-am: uninstall-toolexeclibLIBRARIES \
 		uninstall-toolexeclibLTLIBRARIES uninstall-binPROGRAMS \
-		uninstall-dataDATA uninstall-toolexeclibDATA
+		uninstall-binSCRIPTS uninstall-dataDATA \
+		uninstall-toolexeclibDATA
 uninstall: uninstall-recursive
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(DATA)
+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
+		$(DATA)
 all-redirect: all-recursive
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -1614,7 +1805,8 @@ installdirs: installdirs-recursive
 installdirs-am:
 	$(mkinstalldirs)  $(DESTDIR)$(toolexeclibdir) \
 		$(DESTDIR)$(toolexeclibdir) $(DESTDIR)$(bindir) \
-		$(DESTDIR)$(datadir) $(DESTDIR)$(toolexeclibdir)
+		$(DESTDIR)$(bindir) $(DESTDIR)$(datadir) \
+		$(DESTDIR)$(toolexeclibdir)
 
 
 mostlyclean-generic:
@@ -1680,7 +1872,8 @@ uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \
 mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
 maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
 mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
-clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS uninstall-dataDATA \
+clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
+uninstall-binSCRIPTS install-binSCRIPTS uninstall-dataDATA \
 install-dataDATA uninstall-toolexeclibDATA install-toolexeclibDATA \
 install-data-recursive uninstall-data-recursive install-exec-recursive \
 uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
@@ -1805,6 +1998,14 @@ gnu/gcj/runtime/VMClassLoader.h: gnu/gcj/runtime/VMClassLoader.class libgcj.zip
 	    -friend 'java::lang::ClassLoader;' \
 	    $(basename $<)
 
+java/io/ObjectInputStream$$GetField.h: java/io/ObjectInputStream$$GetField.class libgcj.zip
+	$(GCJH) -classpath $(top_builddir) \
+	'java/io/ObjectInputStream$$GetField'
+
+java/io/ObjectOutputStream$$PutField.h: java/io/ObjectOutputStream$$PutField.class libgcj.zip
+	$(GCJH) -classpath $(top_builddir) \
+	'java/io/ObjectOutputStream$$PutField'
+
 install-data-local:
 	$(PRE_INSTALL)
 	@for f in $(nat_headers) $(extra_headers); do \