Delete old versions of GCC.

Change-Id: I710f125d905290e1024cbd67f48299861790c66c

29 files changed, 0 insertions, 1929 deletions

diff --git a/gcc-4.7/libjava/java/sql/Array.h b/gcc-4.7/libjava/java/sql/Array.h
deleted file mode 100644
index 34a1e840c..000000000
--- a/gcc-4.7/libjava/java/sql/Array.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Array__
-#define __java_sql_Array__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Array;
-        class ResultSet;
-    }
-  }
-}
-
-class java::sql::Array : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getBaseTypeName() = 0;
-  virtual jint getBaseType() = 0;
-  virtual ::java::lang::Object * getArray() = 0;
-  virtual ::java::lang::Object * getArray(::java::util::Map *) = 0;
-  virtual ::java::lang::Object * getArray(jlong, jint) = 0;
-  virtual ::java::lang::Object * getArray(jlong, jint, ::java::util::Map *) = 0;
-  virtual ::java::sql::ResultSet * getResultSet() = 0;
-  virtual ::java::sql::ResultSet * getResultSet(::java::util::Map *) = 0;
-  virtual ::java::sql::ResultSet * getResultSet(jlong, jint) = 0;
-  virtual ::java::sql::ResultSet * getResultSet(jlong, jint, ::java::util::Map *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_Array__
diff --git a/gcc-4.7/libjava/java/sql/BatchUpdateException.h b/gcc-4.7/libjava/java/sql/BatchUpdateException.h
deleted file mode 100644
index b9d28cf88..000000000
--- a/gcc-4.7/libjava/java/sql/BatchUpdateException.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_BatchUpdateException__
-#define __java_sql_BatchUpdateException__
-
-#pragma interface
-
-#include <java/sql/SQLException.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class BatchUpdateException;
-    }
-  }
-}
-
-class java::sql::BatchUpdateException : public ::java::sql::SQLException
-{
-
-public:
-  BatchUpdateException(::java::lang::String *, ::java::lang::String *, jint, JArray< jint > *);
-  BatchUpdateException(::java::lang::String *, ::java::lang::String *, JArray< jint > *);
-  BatchUpdateException(::java::lang::String *, JArray< jint > *);
-  BatchUpdateException(JArray< jint > *);
-  BatchUpdateException();
-  virtual JArray< jint > * getUpdateCounts();
-public: // actually package-private
-  static const jlong serialVersionUID = 5977529877145521757LL;
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::sql::SQLException)))) updateCounts;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_BatchUpdateException__
diff --git a/gcc-4.7/libjava/java/sql/Blob.h b/gcc-4.7/libjava/java/sql/Blob.h
deleted file mode 100644
index a1b00c2ed..000000000
--- a/gcc-4.7/libjava/java/sql/Blob.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Blob__
-#define __java_sql_Blob__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Blob;
-    }
-  }
-}
-
-class java::sql::Blob : public ::java::lang::Object
-{
-
-public:
-  virtual jlong length() = 0;
-  virtual JArray< jbyte > * getBytes(jlong, jint) = 0;
-  virtual ::java::io::InputStream * getBinaryStream() = 0;
-  virtual jlong position(JArray< jbyte > *, jlong) = 0;
-  virtual jlong position(::java::sql::Blob *, jlong) = 0;
-  virtual jint setBytes(jlong, JArray< jbyte > *) = 0;
-  virtual jint setBytes(jlong, JArray< jbyte > *, jint, jint) = 0;
-  virtual ::java::io::OutputStream * setBinaryStream(jlong) = 0;
-  virtual void truncate(jlong) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_Blob__
diff --git a/gcc-4.7/libjava/java/sql/CallableStatement.h b/gcc-4.7/libjava/java/sql/CallableStatement.h
deleted file mode 100644
index 143184e5c..000000000
--- a/gcc-4.7/libjava/java/sql/CallableStatement.h
+++ /dev/null
@@ -1,203 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_CallableStatement__
-#define __java_sql_CallableStatement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-    namespace net
-    {
-        class URL;
-    }
-    namespace sql
-    {
-        class Array;
-        class Blob;
-        class CallableStatement;
-        class Clob;
-        class Connection;
-        class Date;
-        class ParameterMetaData;
-        class Ref;
-        class ResultSet;
-        class ResultSetMetaData;
-        class SQLWarning;
-        class Time;
-        class Timestamp;
-    }
-  }
-}
-
-class java::sql::CallableStatement : public ::java::lang::Object
-{
-
-public:
-  virtual void registerOutParameter(jint, jint) = 0;
-  virtual void registerOutParameter(jint, jint, jint) = 0;
-  virtual jboolean wasNull() = 0;
-  virtual ::java::lang::String * getString(jint) = 0;
-  virtual jboolean getBoolean(jint) = 0;
-  virtual jbyte getByte(jint) = 0;
-  virtual jshort getShort(jint) = 0;
-  virtual jint getInt(jint) = 0;
-  virtual jlong getLong(jint) = 0;
-  virtual jfloat getFloat(jint) = 0;
-  virtual jdouble getDouble(jint) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(jint, jint) = 0;
-  virtual JArray< jbyte > * getBytes(jint) = 0;
-  virtual ::java::sql::Date * getDate(jint) = 0;
-  virtual ::java::sql::Time * getTime(jint) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(jint) = 0;
-  virtual ::java::lang::Object * getObject(jint) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(jint) = 0;
-  virtual ::java::lang::Object * getObject(jint, ::java::util::Map *) = 0;
-  virtual ::java::sql::Ref * getRef(jint) = 0;
-  virtual ::java::sql::Blob * getBlob(jint) = 0;
-  virtual ::java::sql::Clob * getClob(jint) = 0;
-  virtual ::java::sql::Array * getArray(jint) = 0;
-  virtual ::java::sql::Date * getDate(jint, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Time * getTime(jint, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(jint, ::java::util::Calendar *) = 0;
-  virtual void registerOutParameter(jint, jint, ::java::lang::String *) = 0;
-  virtual void registerOutParameter(::java::lang::String *, jint) = 0;
-  virtual void registerOutParameter(::java::lang::String *, jint, jint) = 0;
-  virtual void registerOutParameter(::java::lang::String *, jint, ::java::lang::String *) = 0;
-  virtual ::java::net::URL * getURL(jint) = 0;
-  virtual void setURL(::java::lang::String *, ::java::net::URL *) = 0;
-  virtual void setNull(::java::lang::String *, jint) = 0;
-  virtual void setBoolean(::java::lang::String *, jboolean) = 0;
-  virtual void setByte(::java::lang::String *, jbyte) = 0;
-  virtual void setShort(::java::lang::String *, jshort) = 0;
-  virtual void setInt(::java::lang::String *, jint) = 0;
-  virtual void setLong(::java::lang::String *, jlong) = 0;
-  virtual void setFloat(::java::lang::String *, jfloat) = 0;
-  virtual void setDouble(::java::lang::String *, jdouble) = 0;
-  virtual void setBigDecimal(::java::lang::String *, ::java::math::BigDecimal *) = 0;
-  virtual void setString(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setBytes(::java::lang::String *, JArray< jbyte > *) = 0;
-  virtual void setDate(::java::lang::String *, ::java::sql::Date *) = 0;
-  virtual void setTime(::java::lang::String *, ::java::sql::Time *) = 0;
-  virtual void setTimestamp(::java::lang::String *, ::java::sql::Timestamp *) = 0;
-  virtual void setAsciiStream(::java::lang::String *, ::java::io::InputStream *, jint) = 0;
-  virtual void setBinaryStream(::java::lang::String *, ::java::io::InputStream *, jint) = 0;
-  virtual void setObject(::java::lang::String *, ::java::lang::Object *, jint, jint) = 0;
-  virtual void setObject(::java::lang::String *, ::java::lang::Object *, jint) = 0;
-  virtual void setObject(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void setCharacterStream(::java::lang::String *, ::java::io::Reader *, jint) = 0;
-  virtual void setDate(::java::lang::String *, ::java::sql::Date *, ::java::util::Calendar *) = 0;
-  virtual void setTime(::java::lang::String *, ::java::sql::Time *, ::java::util::Calendar *) = 0;
-  virtual void setTimestamp(::java::lang::String *, ::java::sql::Timestamp *, ::java::util::Calendar *) = 0;
-  virtual void setNull(::java::lang::String *, jint, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getString(::java::lang::String *) = 0;
-  virtual jboolean getBoolean(::java::lang::String *) = 0;
-  virtual jbyte getByte(::java::lang::String *) = 0;
-  virtual jshort getShort(::java::lang::String *) = 0;
-  virtual jint getInt(::java::lang::String *) = 0;
-  virtual jlong getLong(::java::lang::String *) = 0;
-  virtual jfloat getFloat(::java::lang::String *) = 0;
-  virtual jdouble getDouble(::java::lang::String *) = 0;
-  virtual JArray< jbyte > * getBytes(::java::lang::String *) = 0;
-  virtual ::java::sql::Date * getDate(::java::lang::String *) = 0;
-  virtual ::java::sql::Time * getTime(::java::lang::String *) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * getObject(::java::lang::String *) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * getObject(::java::lang::String *, ::java::util::Map *) = 0;
-  virtual ::java::sql::Ref * getRef(::java::lang::String *) = 0;
-  virtual ::java::sql::Blob * getBlob(::java::lang::String *) = 0;
-  virtual ::java::sql::Clob * getClob(::java::lang::String *) = 0;
-  virtual ::java::sql::Array * getArray(::java::lang::String *) = 0;
-  virtual ::java::sql::Date * getDate(::java::lang::String *, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Time * getTime(::java::lang::String *, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(::java::lang::String *, ::java::util::Calendar *) = 0;
-  virtual ::java::net::URL * getURL(::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * executeQuery() = 0;
-  virtual jint executeUpdate() = 0;
-  virtual void setNull(jint, jint) = 0;
-  virtual void setBoolean(jint, jboolean) = 0;
-  virtual void setByte(jint, jbyte) = 0;
-  virtual void setShort(jint, jshort) = 0;
-  virtual void setInt(jint, jint) = 0;
-  virtual void setLong(jint, jlong) = 0;
-  virtual void setFloat(jint, jfloat) = 0;
-  virtual void setDouble(jint, jdouble) = 0;
-  virtual void setBigDecimal(jint, ::java::math::BigDecimal *) = 0;
-  virtual void setString(jint, ::java::lang::String *) = 0;
-  virtual void setBytes(jint, JArray< jbyte > *) = 0;
-  virtual void setDate(jint, ::java::sql::Date *) = 0;
-  virtual void setTime(jint, ::java::sql::Time *) = 0;
-  virtual void setTimestamp(jint, ::java::sql::Timestamp *) = 0;
-  virtual void setAsciiStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void setUnicodeStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void setBinaryStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void clearParameters() = 0;
-  virtual void setObject(jint, ::java::lang::Object *, jint, jint) = 0;
-  virtual void setObject(jint, ::java::lang::Object *, jint) = 0;
-  virtual void setObject(jint, ::java::lang::Object *) = 0;
-  virtual jboolean execute() = 0;
-  virtual void addBatch() = 0;
-  virtual void setCharacterStream(jint, ::java::io::Reader *, jint) = 0;
-  virtual void setRef(jint, ::java::sql::Ref *) = 0;
-  virtual void setBlob(jint, ::java::sql::Blob *) = 0;
-  virtual void setClob(jint, ::java::sql::Clob *) = 0;
-  virtual void setArray(jint, ::java::sql::Array *) = 0;
-  virtual ::java::sql::ResultSetMetaData * getMetaData() = 0;
-  virtual void setDate(jint, ::java::sql::Date *, ::java::util::Calendar *) = 0;
-  virtual void setTime(jint, ::java::sql::Time *, ::java::util::Calendar *) = 0;
-  virtual void setTimestamp(jint, ::java::sql::Timestamp *, ::java::util::Calendar *) = 0;
-  virtual void setNull(jint, jint, ::java::lang::String *) = 0;
-  virtual void setURL(jint, ::java::net::URL *) = 0;
-  virtual ::java::sql::ParameterMetaData * getParameterMetaData() = 0;
-  virtual ::java::sql::ResultSet * executeQuery(::java::lang::String *) = 0;
-  virtual jint executeUpdate(::java::lang::String *) = 0;
-  virtual void close() = 0;
-  virtual jint getMaxFieldSize() = 0;
-  virtual void setMaxFieldSize(jint) = 0;
-  virtual jint getMaxRows() = 0;
-  virtual void setMaxRows(jint) = 0;
-  virtual void setEscapeProcessing(jboolean) = 0;
-  virtual jint getQueryTimeout() = 0;
-  virtual void setQueryTimeout(jint) = 0;
-  virtual void cancel() = 0;
-  virtual ::java::sql::SQLWarning * getWarnings() = 0;
-  virtual void clearWarnings() = 0;
-  virtual void setCursorName(::java::lang::String *) = 0;
-  virtual jboolean execute(::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getResultSet() = 0;
-  virtual jint getUpdateCount() = 0;
-  virtual jboolean getMoreResults() = 0;
-  virtual void setFetchDirection(jint) = 0;
-  virtual jint getFetchDirection() = 0;
-  virtual void setFetchSize(jint) = 0;
-  virtual jint getFetchSize() = 0;
-  virtual jint getResultSetConcurrency() = 0;
-  virtual jint getResultSetType() = 0;
-  virtual void addBatch(::java::lang::String *) = 0;
-  virtual void clearBatch() = 0;
-  virtual JArray< jint > * executeBatch() = 0;
-  virtual ::java::sql::Connection * getConnection() = 0;
-  virtual jboolean getMoreResults(jint) = 0;
-  virtual ::java::sql::ResultSet * getGeneratedKeys() = 0;
-  virtual jint executeUpdate(::java::lang::String *, jint) = 0;
-  virtual jint executeUpdate(::java::lang::String *, JArray< jint > *) = 0;
-  virtual jint executeUpdate(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual jboolean execute(::java::lang::String *, jint) = 0;
-  virtual jboolean execute(::java::lang::String *, JArray< jint > *) = 0;
-  virtual jboolean execute(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual jint getResultSetHoldability() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_CallableStatement__
diff --git a/gcc-4.7/libjava/java/sql/Clob.h b/gcc-4.7/libjava/java/sql/Clob.h
deleted file mode 100644
index a402a0308..000000000
--- a/gcc-4.7/libjava/java/sql/Clob.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Clob__
-#define __java_sql_Clob__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Clob;
-    }
-  }
-}
-
-class java::sql::Clob : public ::java::lang::Object
-{
-
-public:
-  virtual jlong length() = 0;
-  virtual ::java::lang::String * getSubString(jlong, jint) = 0;
-  virtual ::java::io::Reader * getCharacterStream() = 0;
-  virtual ::java::io::InputStream * getAsciiStream() = 0;
-  virtual jlong position(::java::lang::String *, jlong) = 0;
-  virtual jlong position(::java::sql::Clob *, jlong) = 0;
-  virtual jint setString(jlong, ::java::lang::String *) = 0;
-  virtual jint setString(jlong, ::java::lang::String *, jint, jint) = 0;
-  virtual ::java::io::OutputStream * setAsciiStream(jlong) = 0;
-  virtual ::java::io::Writer * setCharacterStream(jlong) = 0;
-  virtual void truncate(jlong) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_Clob__
diff --git a/gcc-4.7/libjava/java/sql/Connection.h b/gcc-4.7/libjava/java/sql/Connection.h
deleted file mode 100644
index 3ce236fc8..000000000
--- a/gcc-4.7/libjava/java/sql/Connection.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Connection__
-#define __java_sql_Connection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class CallableStatement;
-        class Connection;
-        class DatabaseMetaData;
-        class PreparedStatement;
-        class SQLWarning;
-        class Savepoint;
-        class Statement;
-    }
-  }
-}
-
-class java::sql::Connection : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::sql::Statement * createStatement() = 0;
-  virtual ::java::sql::PreparedStatement * prepareStatement(::java::lang::String *) = 0;
-  virtual ::java::sql::CallableStatement * prepareCall(::java::lang::String *) = 0;
-  virtual ::java::lang::String * nativeSQL(::java::lang::String *) = 0;
-  virtual void setAutoCommit(jboolean) = 0;
-  virtual jboolean getAutoCommit() = 0;
-  virtual void commit() = 0;
-  virtual void rollback() = 0;
-  virtual void close() = 0;
-  virtual jboolean isClosed() = 0;
-  virtual ::java::sql::DatabaseMetaData * getMetaData() = 0;
-  virtual void setReadOnly(jboolean) = 0;
-  virtual jboolean isReadOnly() = 0;
-  virtual void setCatalog(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCatalog() = 0;
-  virtual void setTransactionIsolation(jint) = 0;
-  virtual jint getTransactionIsolation() = 0;
-  virtual ::java::sql::SQLWarning * getWarnings() = 0;
-  virtual void clearWarnings() = 0;
-  virtual ::java::sql::Statement * createStatement(jint, jint) = 0;
-  virtual ::java::sql::PreparedStatement * prepareStatement(::java::lang::String *, jint, jint) = 0;
-  virtual ::java::sql::CallableStatement * prepareCall(::java::lang::String *, jint, jint) = 0;
-  virtual ::java::util::Map * getTypeMap() = 0;
-  virtual void setTypeMap(::java::util::Map *) = 0;
-  virtual void setHoldability(jint) = 0;
-  virtual jint getHoldability() = 0;
-  virtual ::java::sql::Savepoint * setSavepoint() = 0;
-  virtual ::java::sql::Savepoint * setSavepoint(::java::lang::String *) = 0;
-  virtual void rollback(::java::sql::Savepoint *) = 0;
-  virtual void releaseSavepoint(::java::sql::Savepoint *) = 0;
-  virtual ::java::sql::Statement * createStatement(jint, jint, jint) = 0;
-  virtual ::java::sql::PreparedStatement * prepareStatement(::java::lang::String *, jint, jint, jint) = 0;
-  virtual ::java::sql::CallableStatement * prepareCall(::java::lang::String *, jint, jint, jint) = 0;
-  virtual ::java::sql::PreparedStatement * prepareStatement(::java::lang::String *, jint) = 0;
-  virtual ::java::sql::PreparedStatement * prepareStatement(::java::lang::String *, JArray< jint > *) = 0;
-  virtual ::java::sql::PreparedStatement * prepareStatement(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  static const jint TRANSACTION_NONE = 0;
-  static const jint TRANSACTION_READ_UNCOMMITTED = 1;
-  static const jint TRANSACTION_READ_COMMITTED = 2;
-  static const jint TRANSACTION_REPEATABLE_READ = 4;
-  static const jint TRANSACTION_SERIALIZABLE = 8;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_Connection__
diff --git a/gcc-4.7/libjava/java/sql/DataTruncation.h b/gcc-4.7/libjava/java/sql/DataTruncation.h
deleted file mode 100644
index 584c65bcf..000000000
--- a/gcc-4.7/libjava/java/sql/DataTruncation.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_DataTruncation__
-#define __java_sql_DataTruncation__
-
-#pragma interface
-
-#include <java/sql/SQLWarning.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class DataTruncation;
-    }
-  }
-}
-
-class java::sql::DataTruncation : public ::java::sql::SQLWarning
-{
-
-public:
-  DataTruncation(jint, jboolean, jboolean, jint, jint);
-  virtual jint getIndex();
-  virtual jboolean getParameter();
-  virtual jboolean getRead();
-  virtual jint getDataSize();
-  virtual jint getTransferSize();
-public: // actually package-private
-  static const jlong serialVersionUID = 6464298989504059473LL;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::sql::SQLWarning)))) dataSize;
-  jint index;
-  jboolean parameter;
-  jboolean read;
-  jint transferSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_DataTruncation__
diff --git a/gcc-4.7/libjava/java/sql/DatabaseMetaData.h b/gcc-4.7/libjava/java/sql/DatabaseMetaData.h
deleted file mode 100644
index 0d1feb748..000000000
--- a/gcc-4.7/libjava/java/sql/DatabaseMetaData.h
+++ /dev/null
@@ -1,245 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_DatabaseMetaData__
-#define __java_sql_DatabaseMetaData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Connection;
-        class DatabaseMetaData;
-        class ResultSet;
-    }
-  }
-}
-
-class java::sql::DatabaseMetaData : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean allProceduresAreCallable() = 0;
-  virtual jboolean allTablesAreSelectable() = 0;
-  virtual ::java::lang::String * getURL() = 0;
-  virtual ::java::lang::String * getUserName() = 0;
-  virtual jboolean isReadOnly() = 0;
-  virtual jboolean nullsAreSortedHigh() = 0;
-  virtual jboolean nullsAreSortedLow() = 0;
-  virtual jboolean nullsAreSortedAtStart() = 0;
-  virtual jboolean nullsAreSortedAtEnd() = 0;
-  virtual ::java::lang::String * getDatabaseProductName() = 0;
-  virtual ::java::lang::String * getDatabaseProductVersion() = 0;
-  virtual ::java::lang::String * getDriverName() = 0;
-  virtual ::java::lang::String * getDriverVersion() = 0;
-  virtual jint getDriverMajorVersion() = 0;
-  virtual jint getDriverMinorVersion() = 0;
-  virtual jboolean usesLocalFiles() = 0;
-  virtual jboolean usesLocalFilePerTable() = 0;
-  virtual jboolean supportsMixedCaseIdentifiers() = 0;
-  virtual jboolean storesUpperCaseIdentifiers() = 0;
-  virtual jboolean storesLowerCaseIdentifiers() = 0;
-  virtual jboolean storesMixedCaseIdentifiers() = 0;
-  virtual jboolean supportsMixedCaseQuotedIdentifiers() = 0;
-  virtual jboolean storesUpperCaseQuotedIdentifiers() = 0;
-  virtual jboolean storesLowerCaseQuotedIdentifiers() = 0;
-  virtual jboolean storesMixedCaseQuotedIdentifiers() = 0;
-  virtual ::java::lang::String * getIdentifierQuoteString() = 0;
-  virtual ::java::lang::String * getSQLKeywords() = 0;
-  virtual ::java::lang::String * getNumericFunctions() = 0;
-  virtual ::java::lang::String * getStringFunctions() = 0;
-  virtual ::java::lang::String * getSystemFunctions() = 0;
-  virtual ::java::lang::String * getTimeDateFunctions() = 0;
-  virtual ::java::lang::String * getSearchStringEscape() = 0;
-  virtual ::java::lang::String * getExtraNameCharacters() = 0;
-  virtual jboolean supportsAlterTableWithAddColumn() = 0;
-  virtual jboolean supportsAlterTableWithDropColumn() = 0;
-  virtual jboolean supportsColumnAliasing() = 0;
-  virtual jboolean nullPlusNonNullIsNull() = 0;
-  virtual jboolean supportsConvert() = 0;
-  virtual jboolean supportsConvert(jint, jint) = 0;
-  virtual jboolean supportsTableCorrelationNames() = 0;
-  virtual jboolean supportsDifferentTableCorrelationNames() = 0;
-  virtual jboolean supportsExpressionsInOrderBy() = 0;
-  virtual jboolean supportsOrderByUnrelated() = 0;
-  virtual jboolean supportsGroupBy() = 0;
-  virtual jboolean supportsGroupByUnrelated() = 0;
-  virtual jboolean supportsGroupByBeyondSelect() = 0;
-  virtual jboolean supportsLikeEscapeClause() = 0;
-  virtual jboolean supportsMultipleResultSets() = 0;
-  virtual jboolean supportsMultipleTransactions() = 0;
-  virtual jboolean supportsNonNullableColumns() = 0;
-  virtual jboolean supportsMinimumSQLGrammar() = 0;
-  virtual jboolean supportsCoreSQLGrammar() = 0;
-  virtual jboolean supportsExtendedSQLGrammar() = 0;
-  virtual jboolean supportsANSI92EntryLevelSQL() = 0;
-  virtual jboolean supportsANSI92IntermediateSQL() = 0;
-  virtual jboolean supportsANSI92FullSQL() = 0;
-  virtual jboolean supportsIntegrityEnhancementFacility() = 0;
-  virtual jboolean supportsOuterJoins() = 0;
-  virtual jboolean supportsFullOuterJoins() = 0;
-  virtual jboolean supportsLimitedOuterJoins() = 0;
-  virtual ::java::lang::String * getSchemaTerm() = 0;
-  virtual ::java::lang::String * getProcedureTerm() = 0;
-  virtual ::java::lang::String * getCatalogTerm() = 0;
-  virtual jboolean isCatalogAtStart() = 0;
-  virtual ::java::lang::String * getCatalogSeparator() = 0;
-  virtual jboolean supportsSchemasInDataManipulation() = 0;
-  virtual jboolean supportsSchemasInProcedureCalls() = 0;
-  virtual jboolean supportsSchemasInTableDefinitions() = 0;
-  virtual jboolean supportsSchemasInIndexDefinitions() = 0;
-  virtual jboolean supportsSchemasInPrivilegeDefinitions() = 0;
-  virtual jboolean supportsCatalogsInDataManipulation() = 0;
-  virtual jboolean supportsCatalogsInProcedureCalls() = 0;
-  virtual jboolean supportsCatalogsInTableDefinitions() = 0;
-  virtual jboolean supportsCatalogsInIndexDefinitions() = 0;
-  virtual jboolean supportsCatalogsInPrivilegeDefinitions() = 0;
-  virtual jboolean supportsPositionedDelete() = 0;
-  virtual jboolean supportsPositionedUpdate() = 0;
-  virtual jboolean supportsSelectForUpdate() = 0;
-  virtual jboolean supportsStoredProcedures() = 0;
-  virtual jboolean supportsSubqueriesInComparisons() = 0;
-  virtual jboolean supportsSubqueriesInExists() = 0;
-  virtual jboolean supportsSubqueriesInIns() = 0;
-  virtual jboolean supportsSubqueriesInQuantifieds() = 0;
-  virtual jboolean supportsCorrelatedSubqueries() = 0;
-  virtual jboolean supportsUnion() = 0;
-  virtual jboolean supportsUnionAll() = 0;
-  virtual jboolean supportsOpenCursorsAcrossCommit() = 0;
-  virtual jboolean supportsOpenCursorsAcrossRollback() = 0;
-  virtual jboolean supportsOpenStatementsAcrossCommit() = 0;
-  virtual jboolean supportsOpenStatementsAcrossRollback() = 0;
-  virtual jint getMaxBinaryLiteralLength() = 0;
-  virtual jint getMaxCharLiteralLength() = 0;
-  virtual jint getMaxColumnNameLength() = 0;
-  virtual jint getMaxColumnsInGroupBy() = 0;
-  virtual jint getMaxColumnsInIndex() = 0;
-  virtual jint getMaxColumnsInOrderBy() = 0;
-  virtual jint getMaxColumnsInSelect() = 0;
-  virtual jint getMaxColumnsInTable() = 0;
-  virtual jint getMaxConnections() = 0;
-  virtual jint getMaxCursorNameLength() = 0;
-  virtual jint getMaxIndexLength() = 0;
-  virtual jint getMaxSchemaNameLength() = 0;
-  virtual jint getMaxProcedureNameLength() = 0;
-  virtual jint getMaxCatalogNameLength() = 0;
-  virtual jint getMaxRowSize() = 0;
-  virtual jboolean doesMaxRowSizeIncludeBlobs() = 0;
-  virtual jint getMaxStatementLength() = 0;
-  virtual jint getMaxStatements() = 0;
-  virtual jint getMaxTableNameLength() = 0;
-  virtual jint getMaxTablesInSelect() = 0;
-  virtual jint getMaxUserNameLength() = 0;
-  virtual jint getDefaultTransactionIsolation() = 0;
-  virtual jboolean supportsTransactions() = 0;
-  virtual jboolean supportsTransactionIsolationLevel(jint) = 0;
-  virtual jboolean supportsDataDefinitionAndDataManipulationTransactions() = 0;
-  virtual jboolean supportsDataManipulationTransactionsOnly() = 0;
-  virtual jboolean dataDefinitionCausesTransactionCommit() = 0;
-  virtual jboolean dataDefinitionIgnoredInTransactions() = 0;
-  virtual ::java::sql::ResultSet * getProcedures(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getProcedureColumns(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getTables(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::java::sql::ResultSet * getSchemas() = 0;
-  virtual ::java::sql::ResultSet * getCatalogs() = 0;
-  virtual ::java::sql::ResultSet * getTableTypes() = 0;
-  virtual ::java::sql::ResultSet * getColumns(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getColumnPrivileges(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getTablePrivileges(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getBestRowIdentifier(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jint, jboolean) = 0;
-  virtual ::java::sql::ResultSet * getVersionColumns(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getPrimaryKeys(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getImportedKeys(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getExportedKeys(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getCrossReference(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getTypeInfo() = 0;
-  virtual ::java::sql::ResultSet * getIndexInfo(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean, jboolean) = 0;
-  virtual jboolean supportsResultSetType(jint) = 0;
-  virtual jboolean supportsResultSetConcurrency(jint, jint) = 0;
-  virtual jboolean ownUpdatesAreVisible(jint) = 0;
-  virtual jboolean ownDeletesAreVisible(jint) = 0;
-  virtual jboolean ownInsertsAreVisible(jint) = 0;
-  virtual jboolean othersUpdatesAreVisible(jint) = 0;
-  virtual jboolean othersDeletesAreVisible(jint) = 0;
-  virtual jboolean othersInsertsAreVisible(jint) = 0;
-  virtual jboolean updatesAreDetected(jint) = 0;
-  virtual jboolean deletesAreDetected(jint) = 0;
-  virtual jboolean insertsAreDetected(jint) = 0;
-  virtual jboolean supportsBatchUpdates() = 0;
-  virtual ::java::sql::ResultSet * getUDTs(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, JArray< jint > *) = 0;
-  virtual ::java::sql::Connection * getConnection() = 0;
-  virtual jboolean supportsSavepoints() = 0;
-  virtual jboolean supportsNamedParameters() = 0;
-  virtual jboolean supportsMultipleOpenResults() = 0;
-  virtual jboolean supportsGetGeneratedKeys() = 0;
-  virtual ::java::sql::ResultSet * getSuperTypes(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getSuperTables(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getAttributes(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean supportsResultSetHoldability(jint) = 0;
-  virtual jint getResultSetHoldability() = 0;
-  virtual jint getDatabaseMajorVersion() = 0;
-  virtual jint getDatabaseMinorVersion() = 0;
-  virtual jint getJDBCMajorVersion() = 0;
-  virtual jint getJDBCMinorVersion() = 0;
-  virtual jint getSQLStateType() = 0;
-  virtual jboolean locatorsUpdateCopy() = 0;
-  virtual jboolean supportsStatementPooling() = 0;
-  static const jint procedureResultUnknown = 0;
-  static const jint procedureNoResult = 1;
-  static const jint procedureReturnsResult = 2;
-  static const jint procedureColumnUnknown = 0;
-  static const jint procedureColumnIn = 1;
-  static const jint procedureColumnInOut = 2;
-  static const jint procedureColumnOut = 4;
-  static const jint procedureColumnReturn = 5;
-  static const jint procedureColumnResult = 3;
-  static const jint procedureNoNulls = 0;
-  static const jint procedureNullable = 1;
-  static const jint procedureNullableUnknown = 2;
-  static const jint columnNoNulls = 0;
-  static const jint columnNullable = 1;
-  static const jint columnNullableUnknown = 2;
-  static const jint bestRowTemporary = 0;
-  static const jint bestRowTransaction = 1;
-  static const jint bestRowSession = 2;
-  static const jint bestRowUnknown = 0;
-  static const jint bestRowNotPseudo = 1;
-  static const jint bestRowPseudo = 2;
-  static const jint versionColumnUnknown = 0;
-  static const jint versionColumnNotPseudo = 1;
-  static const jint versionColumnPseudo = 2;
-  static const jint importedKeyCascade = 0;
-  static const jint importedKeyRestrict = 1;
-  static const jint importedKeySetNull = 2;
-  static const jint importedKeyNoAction = 3;
-  static const jint importedKeySetDefault = 4;
-  static const jint importedKeyInitiallyDeferred = 5;
-  static const jint importedKeyInitiallyImmediate = 6;
-  static const jint importedKeyNotDeferrable = 7;
-  static const jint typeNoNulls = 0;
-  static const jint typeNullable = 1;
-  static const jint typeNullableUnknown = 2;
-  static const jint typePredNone = 0;
-  static const jint typePredChar = 1;
-  static const jint typePredBasic = 2;
-  static const jint typeSearchable = 3;
-  static const jshort tableIndexStatistic = 0;
-  static const jshort tableIndexClustered = 1;
-  static const jshort tableIndexHashed = 2;
-  static const jshort tableIndexOther = 3;
-  static const jshort attributeNoNulls = 0;
-  static const jshort attributeNullable = 1;
-  static const jshort attributeNullableUnknown = 2;
-  static const jint sqlStateXOpen = 1;
-  static const jint sqlStateSQL99 = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_DatabaseMetaData__
diff --git a/gcc-4.7/libjava/java/sql/Date.h b/gcc-4.7/libjava/java/sql/Date.h
deleted file mode 100644
index 8a7939b31..000000000
--- a/gcc-4.7/libjava/java/sql/Date.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Date__
-#define __java_sql_Date__
-
-#pragma interface
-
-#include <java/util/Date.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Date;
-    }
-    namespace text
-    {
-        class SimpleDateFormat;
-    }
-  }
-}
-
-class java::sql::Date : public ::java::util::Date
-{
-
-public:
-  Date(jint, jint, jint);
-  Date(jlong);
-  virtual jint getHours();
-  virtual jint getMinutes();
-  virtual jint getSeconds();
-  virtual void setHours(jint);
-  virtual void setMinutes(jint);
-  virtual void setSeconds(jint);
-  static ::java::sql::Date * valueOf(::java::lang::String *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jlong serialVersionUID = 1511598038487230103LL;
-private:
-  static ::java::text::SimpleDateFormat * sdf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_Date__
diff --git a/gcc-4.7/libjava/java/sql/Driver.h b/gcc-4.7/libjava/java/sql/Driver.h
deleted file mode 100644
index f9800b060..000000000
--- a/gcc-4.7/libjava/java/sql/Driver.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Driver__
-#define __java_sql_Driver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Connection;
-        class Driver;
-        class DriverPropertyInfo;
-    }
-  }
-}
-
-class java::sql::Driver : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::sql::Connection * connect(::java::lang::String *, ::java::util::Properties *) = 0;
-  virtual jboolean acceptsURL(::java::lang::String *) = 0;
-  virtual JArray< ::java::sql::DriverPropertyInfo * > * getPropertyInfo(::java::lang::String *, ::java::util::Properties *) = 0;
-  virtual jint getMajorVersion() = 0;
-  virtual jint getMinorVersion() = 0;
-  virtual jboolean jdbcCompliant() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_Driver__
diff --git a/gcc-4.7/libjava/java/sql/DriverManager.h b/gcc-4.7/libjava/java/sql/DriverManager.h
deleted file mode 100644
index f9d87eabe..000000000
--- a/gcc-4.7/libjava/java/sql/DriverManager.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_DriverManager__
-#define __java_sql_DriverManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Connection;
-        class Driver;
-        class DriverManager;
-    }
-  }
-}
-
-class java::sql::DriverManager : public ::java::lang::Object
-{
-
-  DriverManager();
-public:
-  static ::java::io::PrintWriter * getLogWriter();
-  static void setLogWriter(::java::io::PrintWriter *);
-  static ::java::sql::Connection * getConnection(::java::lang::String *, ::java::util::Properties *);
-  static ::java::sql::Connection * getConnection(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  static ::java::sql::Connection * getConnection(::java::lang::String *);
-  static ::java::sql::Driver * getDriver(::java::lang::String *);
-  static void registerDriver(::java::sql::Driver *);
-  static void deregisterDriver(::java::sql::Driver *);
-  static ::java::util::Enumeration * getDrivers();
-  static void setLoginTimeout(jint);
-  static jint getLoginTimeout();
-  static void setLogStream(::java::io::PrintStream *);
-  static ::java::io::PrintStream * getLogStream();
-  static void println(::java::lang::String *);
-private:
-  static ::java::io::PrintStream * log_stream;
-  static ::java::io::PrintWriter * log_writer;
-  static jint login_timeout;
-  static ::java::util::Vector * drivers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_DriverManager__
diff --git a/gcc-4.7/libjava/java/sql/DriverPropertyInfo.h b/gcc-4.7/libjava/java/sql/DriverPropertyInfo.h
deleted file mode 100644
index 46e21af13..000000000
--- a/gcc-4.7/libjava/java/sql/DriverPropertyInfo.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_DriverPropertyInfo__
-#define __java_sql_DriverPropertyInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class DriverPropertyInfo;
-    }
-  }
-}
-
-class java::sql::DriverPropertyInfo : public ::java::lang::Object
-{
-
-public:
-  DriverPropertyInfo(::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * description;
-  jboolean required;
-  ::java::lang::String * value;
-  JArray< ::java::lang::String * > * choices;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_DriverPropertyInfo__
diff --git a/gcc-4.7/libjava/java/sql/ParameterMetaData.h b/gcc-4.7/libjava/java/sql/ParameterMetaData.h
deleted file mode 100644
index a377668ea..000000000
--- a/gcc-4.7/libjava/java/sql/ParameterMetaData.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_ParameterMetaData__
-#define __java_sql_ParameterMetaData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class ParameterMetaData;
-    }
-  }
-}
-
-class java::sql::ParameterMetaData : public ::java::lang::Object
-{
-
-public:
-  virtual jint getParameterCount() = 0;
-  virtual jint isNullable(jint) = 0;
-  virtual jboolean isSigned(jint) = 0;
-  virtual jint getPrecision(jint) = 0;
-  virtual jint getScale(jint) = 0;
-  virtual jint getParameterType(jint) = 0;
-  virtual ::java::lang::String * getParameterTypeName(jint) = 0;
-  virtual ::java::lang::String * getParameterClassName(jint) = 0;
-  virtual jint getParameterMode(jint) = 0;
-  static const jint parameterNoNulls = 0;
-  static const jint parameterNullable = 1;
-  static const jint parameterNullableUnknown = 2;
-  static const jint parameterModeUnknown = 0;
-  static const jint parameterModeIn = 1;
-  static const jint parameterModeInOut = 2;
-  static const jint parameterModeOut = 4;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_ParameterMetaData__
diff --git a/gcc-4.7/libjava/java/sql/PreparedStatement.h b/gcc-4.7/libjava/java/sql/PreparedStatement.h
deleted file mode 100644
index dcb2e5dea..000000000
--- a/gcc-4.7/libjava/java/sql/PreparedStatement.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_PreparedStatement__
-#define __java_sql_PreparedStatement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-    namespace net
-    {
-        class URL;
-    }
-    namespace sql
-    {
-        class Array;
-        class Blob;
-        class Clob;
-        class Connection;
-        class Date;
-        class ParameterMetaData;
-        class PreparedStatement;
-        class Ref;
-        class ResultSet;
-        class ResultSetMetaData;
-        class SQLWarning;
-        class Time;
-        class Timestamp;
-    }
-  }
-}
-
-class java::sql::PreparedStatement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::sql::ResultSet * executeQuery() = 0;
-  virtual jint executeUpdate() = 0;
-  virtual void setNull(jint, jint) = 0;
-  virtual void setBoolean(jint, jboolean) = 0;
-  virtual void setByte(jint, jbyte) = 0;
-  virtual void setShort(jint, jshort) = 0;
-  virtual void setInt(jint, jint) = 0;
-  virtual void setLong(jint, jlong) = 0;
-  virtual void setFloat(jint, jfloat) = 0;
-  virtual void setDouble(jint, jdouble) = 0;
-  virtual void setBigDecimal(jint, ::java::math::BigDecimal *) = 0;
-  virtual void setString(jint, ::java::lang::String *) = 0;
-  virtual void setBytes(jint, JArray< jbyte > *) = 0;
-  virtual void setDate(jint, ::java::sql::Date *) = 0;
-  virtual void setTime(jint, ::java::sql::Time *) = 0;
-  virtual void setTimestamp(jint, ::java::sql::Timestamp *) = 0;
-  virtual void setAsciiStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void setUnicodeStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void setBinaryStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void clearParameters() = 0;
-  virtual void setObject(jint, ::java::lang::Object *, jint, jint) = 0;
-  virtual void setObject(jint, ::java::lang::Object *, jint) = 0;
-  virtual void setObject(jint, ::java::lang::Object *) = 0;
-  virtual jboolean execute() = 0;
-  virtual void addBatch() = 0;
-  virtual void setCharacterStream(jint, ::java::io::Reader *, jint) = 0;
-  virtual void setRef(jint, ::java::sql::Ref *) = 0;
-  virtual void setBlob(jint, ::java::sql::Blob *) = 0;
-  virtual void setClob(jint, ::java::sql::Clob *) = 0;
-  virtual void setArray(jint, ::java::sql::Array *) = 0;
-  virtual ::java::sql::ResultSetMetaData * getMetaData() = 0;
-  virtual void setDate(jint, ::java::sql::Date *, ::java::util::Calendar *) = 0;
-  virtual void setTime(jint, ::java::sql::Time *, ::java::util::Calendar *) = 0;
-  virtual void setTimestamp(jint, ::java::sql::Timestamp *, ::java::util::Calendar *) = 0;
-  virtual void setNull(jint, jint, ::java::lang::String *) = 0;
-  virtual void setURL(jint, ::java::net::URL *) = 0;
-  virtual ::java::sql::ParameterMetaData * getParameterMetaData() = 0;
-  virtual ::java::sql::ResultSet * executeQuery(::java::lang::String *) = 0;
-  virtual jint executeUpdate(::java::lang::String *) = 0;
-  virtual void close() = 0;
-  virtual jint getMaxFieldSize() = 0;
-  virtual void setMaxFieldSize(jint) = 0;
-  virtual jint getMaxRows() = 0;
-  virtual void setMaxRows(jint) = 0;
-  virtual void setEscapeProcessing(jboolean) = 0;
-  virtual jint getQueryTimeout() = 0;
-  virtual void setQueryTimeout(jint) = 0;
-  virtual void cancel() = 0;
-  virtual ::java::sql::SQLWarning * getWarnings() = 0;
-  virtual void clearWarnings() = 0;
-  virtual void setCursorName(::java::lang::String *) = 0;
-  virtual jboolean execute(::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getResultSet() = 0;
-  virtual jint getUpdateCount() = 0;
-  virtual jboolean getMoreResults() = 0;
-  virtual void setFetchDirection(jint) = 0;
-  virtual jint getFetchDirection() = 0;
-  virtual void setFetchSize(jint) = 0;
-  virtual jint getFetchSize() = 0;
-  virtual jint getResultSetConcurrency() = 0;
-  virtual jint getResultSetType() = 0;
-  virtual void addBatch(::java::lang::String *) = 0;
-  virtual void clearBatch() = 0;
-  virtual JArray< jint > * executeBatch() = 0;
-  virtual ::java::sql::Connection * getConnection() = 0;
-  virtual jboolean getMoreResults(jint) = 0;
-  virtual ::java::sql::ResultSet * getGeneratedKeys() = 0;
-  virtual jint executeUpdate(::java::lang::String *, jint) = 0;
-  virtual jint executeUpdate(::java::lang::String *, JArray< jint > *) = 0;
-  virtual jint executeUpdate(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual jboolean execute(::java::lang::String *, jint) = 0;
-  virtual jboolean execute(::java::lang::String *, JArray< jint > *) = 0;
-  virtual jboolean execute(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual jint getResultSetHoldability() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_PreparedStatement__
diff --git a/gcc-4.7/libjava/java/sql/Ref.h b/gcc-4.7/libjava/java/sql/Ref.h
deleted file mode 100644
index 79cfc9a9c..000000000
--- a/gcc-4.7/libjava/java/sql/Ref.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Ref__
-#define __java_sql_Ref__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Ref;
-    }
-  }
-}
-
-class java::sql::Ref : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getBaseTypeName() = 0;
-  virtual ::java::lang::Object * getObject(::java::util::Map *) = 0;
-  virtual ::java::lang::Object * getObject() = 0;
-  virtual void setObject(::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_Ref__
diff --git a/gcc-4.7/libjava/java/sql/ResultSet.h b/gcc-4.7/libjava/java/sql/ResultSet.h
deleted file mode 100644
index 969c0ecc3..000000000
--- a/gcc-4.7/libjava/java/sql/ResultSet.h
+++ /dev/null
@@ -1,197 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_ResultSet__
-#define __java_sql_ResultSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-    namespace net
-    {
-        class URL;
-    }
-    namespace sql
-    {
-        class Array;
-        class Blob;
-        class Clob;
-        class Date;
-        class Ref;
-        class ResultSet;
-        class ResultSetMetaData;
-        class SQLWarning;
-        class Statement;
-        class Time;
-        class Timestamp;
-    }
-  }
-}
-
-class java::sql::ResultSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean next() = 0;
-  virtual void close() = 0;
-  virtual jboolean wasNull() = 0;
-  virtual ::java::lang::String * getString(jint) = 0;
-  virtual jboolean getBoolean(jint) = 0;
-  virtual jbyte getByte(jint) = 0;
-  virtual jshort getShort(jint) = 0;
-  virtual jint getInt(jint) = 0;
-  virtual jlong getLong(jint) = 0;
-  virtual jfloat getFloat(jint) = 0;
-  virtual jdouble getDouble(jint) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(jint, jint) = 0;
-  virtual JArray< jbyte > * getBytes(jint) = 0;
-  virtual ::java::sql::Date * getDate(jint) = 0;
-  virtual ::java::sql::Time * getTime(jint) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(jint) = 0;
-  virtual ::java::io::InputStream * getAsciiStream(jint) = 0;
-  virtual ::java::io::InputStream * getUnicodeStream(jint) = 0;
-  virtual ::java::io::InputStream * getBinaryStream(jint) = 0;
-  virtual ::java::lang::String * getString(::java::lang::String *) = 0;
-  virtual jboolean getBoolean(::java::lang::String *) = 0;
-  virtual jbyte getByte(::java::lang::String *) = 0;
-  virtual jshort getShort(::java::lang::String *) = 0;
-  virtual jint getInt(::java::lang::String *) = 0;
-  virtual jlong getLong(::java::lang::String *) = 0;
-  virtual jfloat getFloat(::java::lang::String *) = 0;
-  virtual jdouble getDouble(::java::lang::String *) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(::java::lang::String *, jint) = 0;
-  virtual JArray< jbyte > * getBytes(::java::lang::String *) = 0;
-  virtual ::java::sql::Date * getDate(::java::lang::String *) = 0;
-  virtual ::java::sql::Time * getTime(::java::lang::String *) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(::java::lang::String *) = 0;
-  virtual ::java::io::InputStream * getAsciiStream(::java::lang::String *) = 0;
-  virtual ::java::io::InputStream * getUnicodeStream(::java::lang::String *) = 0;
-  virtual ::java::io::InputStream * getBinaryStream(::java::lang::String *) = 0;
-  virtual ::java::sql::SQLWarning * getWarnings() = 0;
-  virtual void clearWarnings() = 0;
-  virtual ::java::lang::String * getCursorName() = 0;
-  virtual ::java::sql::ResultSetMetaData * getMetaData() = 0;
-  virtual ::java::lang::Object * getObject(jint) = 0;
-  virtual ::java::lang::Object * getObject(::java::lang::String *) = 0;
-  virtual jint findColumn(::java::lang::String *) = 0;
-  virtual ::java::io::Reader * getCharacterStream(jint) = 0;
-  virtual ::java::io::Reader * getCharacterStream(::java::lang::String *) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(jint) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(::java::lang::String *) = 0;
-  virtual jboolean isBeforeFirst() = 0;
-  virtual jboolean isAfterLast() = 0;
-  virtual jboolean isFirst() = 0;
-  virtual jboolean isLast() = 0;
-  virtual void beforeFirst() = 0;
-  virtual void afterLast() = 0;
-  virtual jboolean first() = 0;
-  virtual jboolean last() = 0;
-  virtual jint getRow() = 0;
-  virtual jboolean absolute(jint) = 0;
-  virtual jboolean relative(jint) = 0;
-  virtual jboolean previous() = 0;
-  virtual void setFetchDirection(jint) = 0;
-  virtual jint getFetchDirection() = 0;
-  virtual void setFetchSize(jint) = 0;
-  virtual jint getFetchSize() = 0;
-  virtual jint getType() = 0;
-  virtual jint getConcurrency() = 0;
-  virtual jboolean rowUpdated() = 0;
-  virtual jboolean rowInserted() = 0;
-  virtual jboolean rowDeleted() = 0;
-  virtual void updateNull(jint) = 0;
-  virtual void updateBoolean(jint, jboolean) = 0;
-  virtual void updateByte(jint, jbyte) = 0;
-  virtual void updateShort(jint, jshort) = 0;
-  virtual void updateInt(jint, jint) = 0;
-  virtual void updateLong(jint, jlong) = 0;
-  virtual void updateFloat(jint, jfloat) = 0;
-  virtual void updateDouble(jint, jdouble) = 0;
-  virtual void updateBigDecimal(jint, ::java::math::BigDecimal *) = 0;
-  virtual void updateString(jint, ::java::lang::String *) = 0;
-  virtual void updateBytes(jint, JArray< jbyte > *) = 0;
-  virtual void updateDate(jint, ::java::sql::Date *) = 0;
-  virtual void updateTime(jint, ::java::sql::Time *) = 0;
-  virtual void updateTimestamp(jint, ::java::sql::Timestamp *) = 0;
-  virtual void updateAsciiStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void updateBinaryStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void updateCharacterStream(jint, ::java::io::Reader *, jint) = 0;
-  virtual void updateObject(jint, ::java::lang::Object *, jint) = 0;
-  virtual void updateObject(jint, ::java::lang::Object *) = 0;
-  virtual void updateNull(::java::lang::String *) = 0;
-  virtual void updateBoolean(::java::lang::String *, jboolean) = 0;
-  virtual void updateByte(::java::lang::String *, jbyte) = 0;
-  virtual void updateShort(::java::lang::String *, jshort) = 0;
-  virtual void updateInt(::java::lang::String *, jint) = 0;
-  virtual void updateLong(::java::lang::String *, jlong) = 0;
-  virtual void updateFloat(::java::lang::String *, jfloat) = 0;
-  virtual void updateDouble(::java::lang::String *, jdouble) = 0;
-  virtual void updateBigDecimal(::java::lang::String *, ::java::math::BigDecimal *) = 0;
-  virtual void updateString(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void updateBytes(::java::lang::String *, JArray< jbyte > *) = 0;
-  virtual void updateDate(::java::lang::String *, ::java::sql::Date *) = 0;
-  virtual void updateTime(::java::lang::String *, ::java::sql::Time *) = 0;
-  virtual void updateTimestamp(::java::lang::String *, ::java::sql::Timestamp *) = 0;
-  virtual void updateAsciiStream(::java::lang::String *, ::java::io::InputStream *, jint) = 0;
-  virtual void updateBinaryStream(::java::lang::String *, ::java::io::InputStream *, jint) = 0;
-  virtual void updateCharacterStream(::java::lang::String *, ::java::io::Reader *, jint) = 0;
-  virtual void updateObject(::java::lang::String *, ::java::lang::Object *, jint) = 0;
-  virtual void updateObject(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void insertRow() = 0;
-  virtual void updateRow() = 0;
-  virtual void deleteRow() = 0;
-  virtual void refreshRow() = 0;
-  virtual void cancelRowUpdates() = 0;
-  virtual void moveToInsertRow() = 0;
-  virtual void moveToCurrentRow() = 0;
-  virtual ::java::sql::Statement * getStatement() = 0;
-  virtual ::java::lang::Object * getObject(jint, ::java::util::Map *) = 0;
-  virtual ::java::sql::Ref * getRef(jint) = 0;
-  virtual ::java::sql::Blob * getBlob(jint) = 0;
-  virtual ::java::sql::Clob * getClob(jint) = 0;
-  virtual ::java::sql::Array * getArray(jint) = 0;
-  virtual ::java::lang::Object * getObject(::java::lang::String *, ::java::util::Map *) = 0;
-  virtual ::java::sql::Ref * getRef(::java::lang::String *) = 0;
-  virtual ::java::sql::Blob * getBlob(::java::lang::String *) = 0;
-  virtual ::java::sql::Clob * getClob(::java::lang::String *) = 0;
-  virtual ::java::sql::Array * getArray(::java::lang::String *) = 0;
-  virtual ::java::sql::Date * getDate(jint, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Date * getDate(::java::lang::String *, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Time * getTime(jint, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Time * getTime(::java::lang::String *, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(jint, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(::java::lang::String *, ::java::util::Calendar *) = 0;
-  virtual ::java::net::URL * getURL(jint) = 0;
-  virtual ::java::net::URL * getURL(::java::lang::String *) = 0;
-  virtual void updateRef(jint, ::java::sql::Ref *) = 0;
-  virtual void updateRef(::java::lang::String *, ::java::sql::Ref *) = 0;
-  virtual void updateBlob(jint, ::java::sql::Blob *) = 0;
-  virtual void updateBlob(::java::lang::String *, ::java::sql::Blob *) = 0;
-  virtual void updateClob(jint, ::java::sql::Clob *) = 0;
-  virtual void updateClob(::java::lang::String *, ::java::sql::Clob *) = 0;
-  virtual void updateArray(jint, ::java::sql::Array *) = 0;
-  virtual void updateArray(::java::lang::String *, ::java::sql::Array *) = 0;
-  static const jint FETCH_FORWARD = 1000;
-  static const jint FETCH_REVERSE = 1001;
-  static const jint FETCH_UNKNOWN = 1002;
-  static const jint TYPE_FORWARD_ONLY = 1003;
-  static const jint TYPE_SCROLL_INSENSITIVE = 1004;
-  static const jint TYPE_SCROLL_SENSITIVE = 1005;
-  static const jint CONCUR_READ_ONLY = 1007;
-  static const jint CONCUR_UPDATABLE = 1008;
-  static const jint HOLD_CURSORS_OVER_COMMIT = 1;
-  static const jint CLOSE_CURSORS_AT_COMMIT = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_ResultSet__
diff --git a/gcc-4.7/libjava/java/sql/ResultSetMetaData.h b/gcc-4.7/libjava/java/sql/ResultSetMetaData.h
deleted file mode 100644
index d871adee6..000000000
--- a/gcc-4.7/libjava/java/sql/ResultSetMetaData.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_ResultSetMetaData__
-#define __java_sql_ResultSetMetaData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class ResultSetMetaData;
-    }
-  }
-}
-
-class java::sql::ResultSetMetaData : public ::java::lang::Object
-{
-
-public:
-  virtual jint getColumnCount() = 0;
-  virtual jboolean isAutoIncrement(jint) = 0;
-  virtual jboolean isCaseSensitive(jint) = 0;
-  virtual jboolean isSearchable(jint) = 0;
-  virtual jboolean isCurrency(jint) = 0;
-  virtual jint isNullable(jint) = 0;
-  virtual jboolean isSigned(jint) = 0;
-  virtual jint getColumnDisplaySize(jint) = 0;
-  virtual ::java::lang::String * getColumnLabel(jint) = 0;
-  virtual ::java::lang::String * getColumnName(jint) = 0;
-  virtual ::java::lang::String * getSchemaName(jint) = 0;
-  virtual jint getPrecision(jint) = 0;
-  virtual jint getScale(jint) = 0;
-  virtual ::java::lang::String * getTableName(jint) = 0;
-  virtual ::java::lang::String * getCatalogName(jint) = 0;
-  virtual jint getColumnType(jint) = 0;
-  virtual ::java::lang::String * getColumnTypeName(jint) = 0;
-  virtual jboolean isReadOnly(jint) = 0;
-  virtual jboolean isWritable(jint) = 0;
-  virtual jboolean isDefinitelyWritable(jint) = 0;
-  virtual ::java::lang::String * getColumnClassName(jint) = 0;
-  static const jint columnNoNulls = 0;
-  static const jint columnNullable = 1;
-  static const jint columnNullableUnknown = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_ResultSetMetaData__
diff --git a/gcc-4.7/libjava/java/sql/SQLData.h b/gcc-4.7/libjava/java/sql/SQLData.h
deleted file mode 100644
index d63205a72..000000000
--- a/gcc-4.7/libjava/java/sql/SQLData.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_SQLData__
-#define __java_sql_SQLData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class SQLData;
-        class SQLInput;
-        class SQLOutput;
-    }
-  }
-}
-
-class java::sql::SQLData : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getSQLTypeName() = 0;
-  virtual void readSQL(::java::sql::SQLInput *, ::java::lang::String *) = 0;
-  virtual void writeSQL(::java::sql::SQLOutput *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_SQLData__
diff --git a/gcc-4.7/libjava/java/sql/SQLException.h b/gcc-4.7/libjava/java/sql/SQLException.h
deleted file mode 100644
index 3f88d9456..000000000
--- a/gcc-4.7/libjava/java/sql/SQLException.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_SQLException__
-#define __java_sql_SQLException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class SQLException;
-    }
-  }
-}
-
-class java::sql::SQLException : public ::java::lang::Exception
-{
-
-public:
-  SQLException(::java::lang::String *, ::java::lang::String *, jint);
-  SQLException(::java::lang::String *, ::java::lang::String *);
-  SQLException(::java::lang::String *);
-  SQLException();
-  virtual ::java::lang::String * getSQLState();
-  virtual jint getErrorCode();
-  virtual ::java::sql::SQLException * getNextException();
-  virtual void setNextException(::java::sql::SQLException *);
-public: // actually package-private
-  static const jlong serialVersionUID = 2135244094396331484LL;
-private:
-  ::java::sql::SQLException * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) next;
-  ::java::lang::String * SQLState;
-  jint vendorCode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_SQLException__
diff --git a/gcc-4.7/libjava/java/sql/SQLInput.h b/gcc-4.7/libjava/java/sql/SQLInput.h
deleted file mode 100644
index d19ffc03c..000000000
--- a/gcc-4.7/libjava/java/sql/SQLInput.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_SQLInput__
-#define __java_sql_SQLInput__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-    namespace net
-    {
-        class URL;
-    }
-    namespace sql
-    {
-        class Array;
-        class Blob;
-        class Clob;
-        class Date;
-        class Ref;
-        class SQLInput;
-        class Time;
-        class Timestamp;
-    }
-  }
-}
-
-class java::sql::SQLInput : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * readString() = 0;
-  virtual jboolean readBoolean() = 0;
-  virtual jbyte readByte() = 0;
-  virtual jshort readShort() = 0;
-  virtual jint readInt() = 0;
-  virtual jlong readLong() = 0;
-  virtual jfloat readFloat() = 0;
-  virtual jdouble readDouble() = 0;
-  virtual ::java::math::BigDecimal * readBigDecimal() = 0;
-  virtual JArray< jbyte > * readBytes() = 0;
-  virtual ::java::sql::Date * readDate() = 0;
-  virtual ::java::sql::Time * readTime() = 0;
-  virtual ::java::sql::Timestamp * readTimestamp() = 0;
-  virtual ::java::io::Reader * readCharacterStream() = 0;
-  virtual ::java::io::InputStream * readAsciiStream() = 0;
-  virtual ::java::io::InputStream * readBinaryStream() = 0;
-  virtual ::java::lang::Object * readObject() = 0;
-  virtual ::java::sql::Ref * readRef() = 0;
-  virtual ::java::sql::Blob * readBlob() = 0;
-  virtual ::java::sql::Clob * readClob() = 0;
-  virtual ::java::sql::Array * readArray() = 0;
-  virtual jboolean wasNull() = 0;
-  virtual ::java::net::URL * readURL() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_SQLInput__
diff --git a/gcc-4.7/libjava/java/sql/SQLOutput.h b/gcc-4.7/libjava/java/sql/SQLOutput.h
deleted file mode 100644
index f0be2db59..000000000
--- a/gcc-4.7/libjava/java/sql/SQLOutput.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_SQLOutput__
-#define __java_sql_SQLOutput__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-    namespace net
-    {
-        class URL;
-    }
-    namespace sql
-    {
-        class Array;
-        class Blob;
-        class Clob;
-        class Date;
-        class Ref;
-        class SQLData;
-        class SQLOutput;
-        class Struct;
-        class Time;
-        class Timestamp;
-    }
-  }
-}
-
-class java::sql::SQLOutput : public ::java::lang::Object
-{
-
-public:
-  virtual void writeString(::java::lang::String *) = 0;
-  virtual void writeBoolean(jboolean) = 0;
-  virtual void writeByte(jbyte) = 0;
-  virtual void writeShort(jshort) = 0;
-  virtual void writeInt(jint) = 0;
-  virtual void writeLong(jlong) = 0;
-  virtual void writeFloat(jfloat) = 0;
-  virtual void writeDouble(jdouble) = 0;
-  virtual void writeBigDecimal(::java::math::BigDecimal *) = 0;
-  virtual void writeBytes(JArray< jbyte > *) = 0;
-  virtual void writeDate(::java::sql::Date *) = 0;
-  virtual void writeTime(::java::sql::Time *) = 0;
-  virtual void writeTimestamp(::java::sql::Timestamp *) = 0;
-  virtual void writeCharacterStream(::java::io::Reader *) = 0;
-  virtual void writeAsciiStream(::java::io::InputStream *) = 0;
-  virtual void writeBinaryStream(::java::io::InputStream *) = 0;
-  virtual void writeObject(::java::sql::SQLData *) = 0;
-  virtual void writeRef(::java::sql::Ref *) = 0;
-  virtual void writeBlob(::java::sql::Blob *) = 0;
-  virtual void writeClob(::java::sql::Clob *) = 0;
-  virtual void writeStruct(::java::sql::Struct *) = 0;
-  virtual void writeArray(::java::sql::Array *) = 0;
-  virtual void writeURL(::java::net::URL *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_SQLOutput__
diff --git a/gcc-4.7/libjava/java/sql/SQLPermission.h b/gcc-4.7/libjava/java/sql/SQLPermission.h
deleted file mode 100644
index a426f31a0..000000000
--- a/gcc-4.7/libjava/java/sql/SQLPermission.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_SQLPermission__
-#define __java_sql_SQLPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class SQLPermission;
-    }
-  }
-}
-
-class java::sql::SQLPermission : public ::java::security::BasicPermission
-{
-
-public:
-  SQLPermission(::java::lang::String *);
-  SQLPermission(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_SQLPermission__
diff --git a/gcc-4.7/libjava/java/sql/SQLWarning.h b/gcc-4.7/libjava/java/sql/SQLWarning.h
deleted file mode 100644
index 5cb2572ff..000000000
--- a/gcc-4.7/libjava/java/sql/SQLWarning.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_SQLWarning__
-#define __java_sql_SQLWarning__
-
-#pragma interface
-
-#include <java/sql/SQLException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class SQLWarning;
-    }
-  }
-}
-
-class java::sql::SQLWarning : public ::java::sql::SQLException
-{
-
-public:
-  SQLWarning(::java::lang::String *, ::java::lang::String *, jint);
-  SQLWarning(::java::lang::String *, ::java::lang::String *);
-  SQLWarning(::java::lang::String *);
-  SQLWarning();
-  virtual ::java::sql::SQLWarning * getNextWarning();
-  virtual void setNextWarning(::java::sql::SQLWarning *);
-public: // actually package-private
-  static const jlong serialVersionUID = 3917336774604784856LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_SQLWarning__
diff --git a/gcc-4.7/libjava/java/sql/Savepoint.h b/gcc-4.7/libjava/java/sql/Savepoint.h
deleted file mode 100644
index d22773c9f..000000000
--- a/gcc-4.7/libjava/java/sql/Savepoint.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Savepoint__
-#define __java_sql_Savepoint__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Savepoint;
-    }
-  }
-}
-
-class java::sql::Savepoint : public ::java::lang::Object
-{
-
-public:
-  virtual jint getSavepointId() = 0;
-  virtual ::java::lang::String * getSavepointName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_Savepoint__
diff --git a/gcc-4.7/libjava/java/sql/Statement.h b/gcc-4.7/libjava/java/sql/Statement.h
deleted file mode 100644
index b4cba4489..000000000
--- a/gcc-4.7/libjava/java/sql/Statement.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Statement__
-#define __java_sql_Statement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Connection;
-        class ResultSet;
-        class SQLWarning;
-        class Statement;
-    }
-  }
-}
-
-class java::sql::Statement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::sql::ResultSet * executeQuery(::java::lang::String *) = 0;
-  virtual jint executeUpdate(::java::lang::String *) = 0;
-  virtual void close() = 0;
-  virtual jint getMaxFieldSize() = 0;
-  virtual void setMaxFieldSize(jint) = 0;
-  virtual jint getMaxRows() = 0;
-  virtual void setMaxRows(jint) = 0;
-  virtual void setEscapeProcessing(jboolean) = 0;
-  virtual jint getQueryTimeout() = 0;
-  virtual void setQueryTimeout(jint) = 0;
-  virtual void cancel() = 0;
-  virtual ::java::sql::SQLWarning * getWarnings() = 0;
-  virtual void clearWarnings() = 0;
-  virtual void setCursorName(::java::lang::String *) = 0;
-  virtual jboolean execute(::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getResultSet() = 0;
-  virtual jint getUpdateCount() = 0;
-  virtual jboolean getMoreResults() = 0;
-  virtual void setFetchDirection(jint) = 0;
-  virtual jint getFetchDirection() = 0;
-  virtual void setFetchSize(jint) = 0;
-  virtual jint getFetchSize() = 0;
-  virtual jint getResultSetConcurrency() = 0;
-  virtual jint getResultSetType() = 0;
-  virtual void addBatch(::java::lang::String *) = 0;
-  virtual void clearBatch() = 0;
-  virtual JArray< jint > * executeBatch() = 0;
-  virtual ::java::sql::Connection * getConnection() = 0;
-  virtual jboolean getMoreResults(jint) = 0;
-  virtual ::java::sql::ResultSet * getGeneratedKeys() = 0;
-  virtual jint executeUpdate(::java::lang::String *, jint) = 0;
-  virtual jint executeUpdate(::java::lang::String *, JArray< jint > *) = 0;
-  virtual jint executeUpdate(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual jboolean execute(::java::lang::String *, jint) = 0;
-  virtual jboolean execute(::java::lang::String *, JArray< jint > *) = 0;
-  virtual jboolean execute(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual jint getResultSetHoldability() = 0;
-  static const jint CLOSE_CURRENT_RESULT = 1;
-  static const jint KEEP_CURRENT_RESULT = 2;
-  static const jint CLOSE_ALL_RESULTS = 3;
-  static const jint SUCCESS_NO_INFO = -2;
-  static const jint EXECUTE_FAILED = -3;
-  static const jint RETURN_GENERATED_KEYS = 1;
-  static const jint NO_GENERATED_KEYS = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_Statement__
diff --git a/gcc-4.7/libjava/java/sql/Struct.h b/gcc-4.7/libjava/java/sql/Struct.h
deleted file mode 100644
index ff9be27b9..000000000
--- a/gcc-4.7/libjava/java/sql/Struct.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Struct__
-#define __java_sql_Struct__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Struct;
-    }
-  }
-}
-
-class java::sql::Struct : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getSQLTypeName() = 0;
-  virtual JArray< ::java::lang::Object * > * getAttributes() = 0;
-  virtual JArray< ::java::lang::Object * > * getAttributes(::java::util::Map *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_Struct__
diff --git a/gcc-4.7/libjava/java/sql/Time.h b/gcc-4.7/libjava/java/sql/Time.h
deleted file mode 100644
index a9c5d12af..000000000
--- a/gcc-4.7/libjava/java/sql/Time.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Time__
-#define __java_sql_Time__
-
-#pragma interface
-
-#include <java/util/Date.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Time;
-    }
-    namespace text
-    {
-        class SimpleDateFormat;
-    }
-  }
-}
-
-class java::sql::Time : public ::java::util::Date
-{
-
-public:
-  virtual jint getDate();
-  virtual jint getDay();
-  virtual jint getMonth();
-  virtual jint getYear();
-  virtual void setDate(jint);
-  virtual void setMonth(jint);
-  virtual void setYear(jint);
-  static ::java::sql::Time * valueOf(::java::lang::String *);
-  Time(jint, jint, jint);
-  Time(jlong);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jlong serialVersionUID = 8397324403548013681LL;
-private:
-  static ::java::text::SimpleDateFormat * sdf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_Time__
diff --git a/gcc-4.7/libjava/java/sql/Timestamp.h b/gcc-4.7/libjava/java/sql/Timestamp.h
deleted file mode 100644
index 90333692e..000000000
--- a/gcc-4.7/libjava/java/sql/Timestamp.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Timestamp__
-#define __java_sql_Timestamp__
-
-#pragma interface
-
-#include <java/util/Date.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Timestamp;
-    }
-    namespace text
-    {
-        class DecimalFormat;
-        class SimpleDateFormat;
-    }
-  }
-}
-
-class java::sql::Timestamp : public ::java::util::Date
-{
-
-public:
-  static ::java::sql::Timestamp * valueOf(::java::lang::String *);
-  Timestamp(jint, jint, jint, jint, jint, jint, jint);
-  Timestamp(jlong);
-  virtual jlong getTime();
-  virtual ::java::lang::String * toString();
-  virtual jint getNanos();
-  virtual void setNanos(jint);
-  virtual jboolean before(::java::sql::Timestamp *);
-  virtual jboolean after(::java::sql::Timestamp *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jboolean equals(::java::sql::Timestamp *);
-  virtual jint compareTo(::java::sql::Timestamp *);
-  virtual jint Date$compareTo(::java::util::Date *);
-public: // actually package-private
-  static const jlong serialVersionUID = 2745179027874758501LL;
-private:
-  static ::java::text::SimpleDateFormat * dateFormat;
-  static ::java::text::DecimalFormat * decimalFormat;
-  static ::java::lang::StringBuffer * sbuf;
-  jint __attribute__((aligned(__alignof__( ::java::util::Date)))) nanos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_Timestamp__
diff --git a/gcc-4.7/libjava/java/sql/Types.h b/gcc-4.7/libjava/java/sql/Types.h
deleted file mode 100644
index 8f6388fe2..000000000
--- a/gcc-4.7/libjava/java/sql/Types.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Types__
-#define __java_sql_Types__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Types;
-    }
-  }
-}
-
-class java::sql::Types : public ::java::lang::Object
-{
-
-  Types();
-public:
-  static const jint BIT = -7;
-  static const jint TINYINT = -6;
-  static const jint SMALLINT = 5;
-  static const jint INTEGER = 4;
-  static const jint BIGINT = -5;
-  static const jint FLOAT = 6;
-  static const jint REAL = 7;
-  static const jint DOUBLE = 8;
-  static const jint NUMERIC = 2;
-  static const jint DECIMAL = 3;
-  static const jint CHAR = 1;
-  static const jint VARCHAR = 12;
-  static const jint LONGVARCHAR = -1;
-  static const jint DATE = 91;
-  static const jint TIME = 92;
-  static const jint TIMESTAMP = 93;
-  static const jint BINARY = -2;
-  static const jint VARBINARY = -3;
-  static const jint LONGVARBINARY = -4;
-  static const jint NULL = 0;
-  static const jint OTHER = 1111;
-  static const jint JAVA_OBJECT = 2000;
-  static const jint DISTINCT = 2001;
-  static const jint STRUCT = 2002;
-  static const jint ARRAY = 2003;
-  static const jint BLOB = 2004;
-  static const jint CLOB = 2005;
-  static const jint REF = 2006;
-  static const jint DATALINK = 70;
-  static const jint BOOLEAN = 16;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_Types__