Merged gcj-eclipse branch to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4

57 files changed, 2351 insertions, 13 deletions

diff --git a/libjava/gnu/gcj/Core.h b/libjava/gnu/gcj/Core.h
new file mode 100644
index 00000000000..ba28bf11da3
--- /dev/null
+++ b/libjava/gnu/gcj/Core.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_Core__
+#define __gnu_gcj_Core__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+        class Core;
+        class RawData;
+    }
+  }
+}
+
+class gnu::gcj::Core : public ::java::lang::Object
+{
+
+public:
+  static ::gnu::gcj::Core * create(::java::lang::String *);
+  static ::gnu::gcj::Core * find(::java::lang::String *);
+public: // actually package-private
+  Core();
+public:
+  ::gnu::gcj::RawData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ptr;
+  jint length;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_Core__
diff --git a/libjava/gnu/gcj/RawData.h b/libjava/gnu/gcj/RawData.h
new file mode 100644
index 00000000000..8cb1188d7aa
--- /dev/null
+++ b/libjava/gnu/gcj/RawData.h
@@ -0,0 +1,29 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_RawData__
+#define __gnu_gcj_RawData__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+        class RawData;
+    }
+  }
+}
+
+class gnu::gcj::RawData : public ::java::lang::Object
+{
+
+  RawData();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_RawData__
diff --git a/libjava/gnu/gcj/RawDataManaged.h b/libjava/gnu/gcj/RawDataManaged.h
new file mode 100644
index 00000000000..cb9673e2618
--- /dev/null
+++ b/libjava/gnu/gcj/RawDataManaged.h
@@ -0,0 +1,29 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_RawDataManaged__
+#define __gnu_gcj_RawDataManaged__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+        class RawDataManaged;
+    }
+  }
+}
+
+class gnu::gcj::RawDataManaged : public ::java::lang::Object
+{
+
+  RawDataManaged();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_RawDataManaged__
diff --git a/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.h b/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.h
new file mode 100644
index 00000000000..f9d4a8830e8
--- /dev/null
+++ b/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_BytesToCharsetAdaptor__
+#define __gnu_gcj_convert_BytesToCharsetAdaptor__
+
+#pragma interface
+
+#include <gnu/gcj/convert/BytesToUnicode.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class BytesToCharsetAdaptor;
+      }
+    }
+  }
+  namespace java
+  {
+    namespace nio
+    {
+        class ByteBuffer;
+      namespace charset
+      {
+          class Charset;
+          class CharsetDecoder;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::BytesToCharsetAdaptor : public ::gnu::gcj::convert::BytesToUnicode
+{
+
+public:
+  BytesToCharsetAdaptor(::java::nio::charset::Charset *);
+  BytesToCharsetAdaptor(::java::nio::charset::CharsetDecoder *);
+  virtual ::java::lang::String * getName();
+  virtual jint read(JArray< jchar > *, jint, jint);
+  virtual void done();
+private:
+  ::java::nio::charset::CharsetDecoder * __attribute__((aligned(__alignof__( ::gnu::gcj::convert::BytesToUnicode)))) decoder;
+  ::java::nio::ByteBuffer * inBuf;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_BytesToCharsetAdaptor__
diff --git a/libjava/gnu/gcj/convert/BytesToUnicode.h b/libjava/gnu/gcj/convert/BytesToUnicode.h
new file mode 100644
index 00000000000..15ff3ec55b9
--- /dev/null
+++ b/libjava/gnu/gcj/convert/BytesToUnicode.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_BytesToUnicode__
+#define __gnu_gcj_convert_BytesToUnicode__
+
+#pragma interface
+
+#include <gnu/gcj/convert/IOConverter.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class BytesToUnicode;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::BytesToUnicode : public ::gnu::gcj::convert::IOConverter
+{
+
+public:
+  BytesToUnicode();
+  virtual ::java::lang::String * getName() = 0;
+  static ::gnu::gcj::convert::BytesToUnicode * getDefaultDecoder();
+  static ::gnu::gcj::convert::BytesToUnicode * getDecoder(::java::lang::String *);
+  virtual void setInput(JArray< jbyte > *, jint, jint);
+  virtual jint read(JArray< jchar > *, jint, jint) = 0;
+  virtual void done();
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::gcj::convert::IOConverter)))) inbuffer;
+  jint inpos;
+  jint inlength;
+public: // actually package-private
+  static ::java::lang::String * defaultEncoding;
+private:
+  static const jint CACHE_SIZE = 4;
+  static JArray< ::gnu::gcj::convert::BytesToUnicode * > * decoderCache;
+  static jint currCachePos;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_BytesToUnicode__
diff --git a/libjava/gnu/gcj/convert/CharsetToBytesAdaptor.h b/libjava/gnu/gcj/convert/CharsetToBytesAdaptor.h
new file mode 100644
index 00000000000..4115ef4907d
--- /dev/null
+++ b/libjava/gnu/gcj/convert/CharsetToBytesAdaptor.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_CharsetToBytesAdaptor__
+#define __gnu_gcj_convert_CharsetToBytesAdaptor__
+
+#pragma interface
+
+#include <gnu/gcj/convert/UnicodeToBytes.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class CharsetToBytesAdaptor;
+      }
+    }
+  }
+  namespace java
+  {
+    namespace nio
+    {
+        class ByteBuffer;
+        class CharBuffer;
+      namespace charset
+      {
+          class Charset;
+          class CharsetEncoder;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::CharsetToBytesAdaptor : public ::gnu::gcj::convert::UnicodeToBytes
+{
+
+public:
+  CharsetToBytesAdaptor(::java::nio::charset::Charset *);
+  CharsetToBytesAdaptor(::java::nio::charset::CharsetEncoder *);
+  virtual ::java::lang::String * getName();
+  virtual jint write(JArray< jchar > *, jint, jint);
+  virtual jint write(::java::lang::String *, jint, jint, jchar);
+private:
+  void write(::java::nio::CharBuffer *);
+public:
+  virtual jboolean havePendingBytes();
+  virtual void setFinished();
+  virtual void done();
+private:
+  ::java::nio::charset::CharsetEncoder * __attribute__((aligned(__alignof__( ::gnu::gcj::convert::UnicodeToBytes)))) encoder;
+  ::java::nio::ByteBuffer * outBuf;
+  jboolean closedEncoder;
+  jboolean hasBytes;
+  jboolean finished;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_CharsetToBytesAdaptor__
diff --git a/libjava/gnu/gcj/convert/Convert.h b/libjava/gnu/gcj/convert/Convert.h
new file mode 100644
index 00000000000..8a77702240e
--- /dev/null
+++ b/libjava/gnu/gcj/convert/Convert.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_Convert__
+#define __gnu_gcj_convert_Convert__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class Convert;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::Convert : public ::java::lang::Object
+{
+
+public:
+  Convert();
+public: // actually package-private
+  static void error(::java::lang::String *);
+  static void help();
+  static void version();
+  static void missing(::java::lang::String *);
+public:
+  static void main(JArray< ::java::lang::String * > *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_Convert__
diff --git a/libjava/gnu/gcj/convert/IOConverter.h b/libjava/gnu/gcj/convert/IOConverter.h
new file mode 100644
index 00000000000..66548598bc1
--- /dev/null
+++ b/libjava/gnu/gcj/convert/IOConverter.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_IOConverter__
+#define __gnu_gcj_convert_IOConverter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class IOConverter;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::IOConverter : public ::java::lang::Object
+{
+
+public:
+  IOConverter();
+private:
+  static jboolean iconv_init();
+public: // actually protected
+  static ::java::lang::String * canonicalize(::java::lang::String *);
+private:
+  static ::java::util::Hashtable * hash;
+public: // actually protected
+  static jboolean iconv_byte_swap;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_IOConverter__
diff --git a/libjava/gnu/gcj/convert/Input_8859_1.h b/libjava/gnu/gcj/convert/Input_8859_1.h
new file mode 100644
index 00000000000..eccb4b34c13
--- /dev/null
+++ b/libjava/gnu/gcj/convert/Input_8859_1.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_Input_8859_1__
+#define __gnu_gcj_convert_Input_8859_1__
+
+#pragma interface
+
+#include <gnu/gcj/convert/BytesToUnicode.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class Input_8859_1;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::Input_8859_1 : public ::gnu::gcj::convert::BytesToUnicode
+{
+
+public:
+  Input_8859_1();
+  virtual ::java::lang::String * getName();
+  virtual jint read(JArray< jchar > *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_Input_8859_1__
diff --git a/libjava/gnu/gcj/convert/Input_ASCII.h b/libjava/gnu/gcj/convert/Input_ASCII.h
new file mode 100644
index 00000000000..fcc8c65a367
--- /dev/null
+++ b/libjava/gnu/gcj/convert/Input_ASCII.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_Input_ASCII__
+#define __gnu_gcj_convert_Input_ASCII__
+
+#pragma interface
+
+#include <gnu/gcj/convert/BytesToUnicode.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class Input_ASCII;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::Input_ASCII : public ::gnu::gcj::convert::BytesToUnicode
+{
+
+public:
+  Input_ASCII();
+  virtual ::java::lang::String * getName();
+  virtual jint read(JArray< jchar > *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_Input_ASCII__
diff --git a/libjava/gnu/gcj/convert/Input_EUCJIS.h b/libjava/gnu/gcj/convert/Input_EUCJIS.h
new file mode 100644
index 00000000000..3a93c52db51
--- /dev/null
+++ b/libjava/gnu/gcj/convert/Input_EUCJIS.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_Input_EUCJIS__
+#define __gnu_gcj_convert_Input_EUCJIS__
+
+#pragma interface
+
+#include <gnu/gcj/convert/BytesToUnicode.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class Input_EUCJIS;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::Input_EUCJIS : public ::gnu::gcj::convert::BytesToUnicode
+{
+
+public:
+  Input_EUCJIS();
+  virtual ::java::lang::String * getName();
+  virtual jint read(JArray< jchar > *, jint, jint);
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::gnu::gcj::convert::BytesToUnicode)))) codeset;
+  jint first_byte;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_Input_EUCJIS__
diff --git a/libjava/gnu/gcj/convert/Input_JavaSrc.h b/libjava/gnu/gcj/convert/Input_JavaSrc.h
new file mode 100644
index 00000000000..4509cf64a1e
--- /dev/null
+++ b/libjava/gnu/gcj/convert/Input_JavaSrc.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_Input_JavaSrc__
+#define __gnu_gcj_convert_Input_JavaSrc__
+
+#pragma interface
+
+#include <gnu/gcj/convert/BytesToUnicode.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class Input_JavaSrc;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::Input_JavaSrc : public ::gnu::gcj::convert::BytesToUnicode
+{
+
+public:
+  Input_JavaSrc();
+  virtual ::java::lang::String * getName();
+  virtual jint read(JArray< jchar > *, jint, jint);
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::gnu::gcj::convert::BytesToUnicode)))) state;
+  jint value;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_Input_JavaSrc__
diff --git a/libjava/gnu/gcj/convert/Input_SJIS.h b/libjava/gnu/gcj/convert/Input_SJIS.h
new file mode 100644
index 00000000000..d2cacbe4388
--- /dev/null
+++ b/libjava/gnu/gcj/convert/Input_SJIS.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_Input_SJIS__
+#define __gnu_gcj_convert_Input_SJIS__
+
+#pragma interface
+
+#include <gnu/gcj/convert/BytesToUnicode.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class Input_SJIS;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::Input_SJIS : public ::gnu::gcj::convert::BytesToUnicode
+{
+
+public:
+  Input_SJIS();
+  virtual ::java::lang::String * getName();
+  virtual jint read(JArray< jchar > *, jint, jint);
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::gnu::gcj::convert::BytesToUnicode)))) first_byte;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_Input_SJIS__
diff --git a/libjava/gnu/gcj/convert/Input_UTF8.h b/libjava/gnu/gcj/convert/Input_UTF8.h
new file mode 100644
index 00000000000..347513bda8f
--- /dev/null
+++ b/libjava/gnu/gcj/convert/Input_UTF8.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_Input_UTF8__
+#define __gnu_gcj_convert_Input_UTF8__
+
+#pragma interface
+
+#include <gnu/gcj/convert/BytesToUnicode.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class Input_UTF8;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::Input_UTF8 : public ::gnu::gcj::convert::BytesToUnicode
+{
+
+public:
+  Input_UTF8();
+  virtual ::java::lang::String * getName();
+  virtual jint read(JArray< jchar > *, jint, jint);
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::gnu::gcj::convert::BytesToUnicode)))) partial;
+  jint partial_bytes_expected;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_Input_UTF8__
diff --git a/libjava/gnu/gcj/convert/Input_UnicodeBig.h b/libjava/gnu/gcj/convert/Input_UnicodeBig.h
new file mode 100644
index 00000000000..ec834edecf8
--- /dev/null
+++ b/libjava/gnu/gcj/convert/Input_UnicodeBig.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_Input_UnicodeBig__
+#define __gnu_gcj_convert_Input_UnicodeBig__
+
+#pragma interface
+
+#include <gnu/gcj/convert/BytesToUnicode.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class Input_UnicodeBig;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::Input_UnicodeBig : public ::gnu::gcj::convert::BytesToUnicode
+{
+
+public:
+  Input_UnicodeBig();
+  virtual ::java::lang::String * getName();
+  virtual jint read(JArray< jchar > *, jint, jint);
+public: // actually package-private
+  jchar __attribute__((aligned(__alignof__( ::gnu::gcj::convert::BytesToUnicode)))) partial;
+  jint partial_count;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_Input_UnicodeBig__
diff --git a/libjava/gnu/gcj/convert/Input_UnicodeLittle.h b/libjava/gnu/gcj/convert/Input_UnicodeLittle.h
new file mode 100644
index 00000000000..ddc3c0620bd
--- /dev/null
+++ b/libjava/gnu/gcj/convert/Input_UnicodeLittle.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_Input_UnicodeLittle__
+#define __gnu_gcj_convert_Input_UnicodeLittle__
+
+#pragma interface
+
+#include <gnu/gcj/convert/BytesToUnicode.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class Input_UnicodeLittle;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::Input_UnicodeLittle : public ::gnu::gcj::convert::BytesToUnicode
+{
+
+public:
+  Input_UnicodeLittle();
+  virtual ::java::lang::String * getName();
+  virtual jint read(JArray< jchar > *, jint, jint);
+public: // actually package-private
+  jchar __attribute__((aligned(__alignof__( ::gnu::gcj::convert::BytesToUnicode)))) partial;
+  jint partial_count;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_Input_UnicodeLittle__
diff --git a/libjava/gnu/gcj/convert/Input_iconv.h b/libjava/gnu/gcj/convert/Input_iconv.h
new file mode 100644
index 00000000000..7fd8893f133
--- /dev/null
+++ b/libjava/gnu/gcj/convert/Input_iconv.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_Input_iconv__
+#define __gnu_gcj_convert_Input_iconv__
+
+#pragma interface
+
+#include <gnu/gcj/convert/BytesToUnicode.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+        class RawData;
+      namespace convert
+      {
+          class Input_iconv;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::Input_iconv : public ::gnu::gcj::convert::BytesToUnicode
+{
+
+public:
+  Input_iconv(::java::lang::String *);
+  virtual ::java::lang::String * getName();
+  virtual void finalize();
+private:
+  void init(::java::lang::String *);
+public:
+  virtual jint read(JArray< jchar > *, jint, jint);
+  virtual void done();
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::gcj::convert::BytesToUnicode)))) encoding;
+  ::gnu::gcj::RawData * handle;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_Input_iconv__
diff --git a/libjava/gnu/gcj/convert/Output_8859_1.h b/libjava/gnu/gcj/convert/Output_8859_1.h
new file mode 100644
index 00000000000..8dcd92d4548
--- /dev/null
+++ b/libjava/gnu/gcj/convert/Output_8859_1.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_Output_8859_1__
+#define __gnu_gcj_convert_Output_8859_1__
+
+#pragma interface
+
+#include <gnu/gcj/convert/UnicodeToBytes.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class Output_8859_1;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::Output_8859_1 : public ::gnu::gcj::convert::UnicodeToBytes
+{
+
+public:
+  Output_8859_1();
+  virtual ::java::lang::String * getName();
+  virtual jint write(JArray< jchar > *, jint, jint);
+  virtual jint write(::java::lang::String *, jint, jint, JArray< jchar > *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_Output_8859_1__
diff --git a/libjava/gnu/gcj/convert/Output_ASCII.h b/libjava/gnu/gcj/convert/Output_ASCII.h
new file mode 100644
index 00000000000..3dc551cbcb6
--- /dev/null
+++ b/libjava/gnu/gcj/convert/Output_ASCII.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_Output_ASCII__
+#define __gnu_gcj_convert_Output_ASCII__
+
+#pragma interface
+
+#include <gnu/gcj/convert/UnicodeToBytes.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class Output_ASCII;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::Output_ASCII : public ::gnu::gcj::convert::UnicodeToBytes
+{
+
+public:
+  Output_ASCII();
+  virtual ::java::lang::String * getName();
+  virtual jint write(JArray< jchar > *, jint, jint);
+  virtual jint write(::java::lang::String *, jint, jint, JArray< jchar > *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_Output_ASCII__
diff --git a/libjava/gnu/gcj/convert/Output_EUCJIS.h b/libjava/gnu/gcj/convert/Output_EUCJIS.h
new file mode 100644
index 00000000000..f1d925857fe
--- /dev/null
+++ b/libjava/gnu/gcj/convert/Output_EUCJIS.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_Output_EUCJIS__
+#define __gnu_gcj_convert_Output_EUCJIS__
+
+#pragma interface
+
+#include <gnu/gcj/convert/UnicodeToBytes.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class Output_EUCJIS;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::Output_EUCJIS : public ::gnu::gcj::convert::UnicodeToBytes
+{
+
+public:
+  Output_EUCJIS();
+  virtual ::java::lang::String * getName();
+  virtual jint write(JArray< jchar > *, jint, jint);
+  virtual jint write(::java::lang::String *, jint, jint, JArray< jchar > *);
+  virtual jboolean havePendingBytes();
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::gnu::gcj::convert::UnicodeToBytes)))) pending1;
+  jint pending2;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_Output_EUCJIS__
diff --git a/libjava/gnu/gcj/convert/Output_JavaSrc.h b/libjava/gnu/gcj/convert/Output_JavaSrc.h
new file mode 100644
index 00000000000..8cea3739017
--- /dev/null
+++ b/libjava/gnu/gcj/convert/Output_JavaSrc.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_Output_JavaSrc__
+#define __gnu_gcj_convert_Output_JavaSrc__
+
+#pragma interface
+
+#include <gnu/gcj/convert/UnicodeToBytes.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class Output_JavaSrc;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::Output_JavaSrc : public ::gnu::gcj::convert::UnicodeToBytes
+{
+
+public:
+  Output_JavaSrc();
+  virtual ::java::lang::String * getName();
+  virtual jint write(JArray< jchar > *, jint, jint);
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::gnu::gcj::convert::UnicodeToBytes)))) todo;
+  jint pending_char;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_Output_JavaSrc__
diff --git a/libjava/gnu/gcj/convert/Output_SJIS.h b/libjava/gnu/gcj/convert/Output_SJIS.h
new file mode 100644
index 00000000000..5175d201631
--- /dev/null
+++ b/libjava/gnu/gcj/convert/Output_SJIS.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_Output_SJIS__
+#define __gnu_gcj_convert_Output_SJIS__
+
+#pragma interface
+
+#include <gnu/gcj/convert/UnicodeToBytes.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class Output_SJIS;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::Output_SJIS : public ::gnu::gcj::convert::UnicodeToBytes
+{
+
+public:
+  Output_SJIS();
+  virtual ::java::lang::String * getName();
+  virtual jint write(JArray< jchar > *, jint, jint);
+  virtual jint write(::java::lang::String *, jint, jint, JArray< jchar > *);
+  virtual jboolean havePendingBytes();
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::gnu::gcj::convert::UnicodeToBytes)))) pending;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_Output_SJIS__
diff --git a/libjava/gnu/gcj/convert/Output_UTF8.h b/libjava/gnu/gcj/convert/Output_UTF8.h
new file mode 100644
index 00000000000..167b62dba7e
--- /dev/null
+++ b/libjava/gnu/gcj/convert/Output_UTF8.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_Output_UTF8__
+#define __gnu_gcj_convert_Output_UTF8__
+
+#pragma interface
+
+#include <gnu/gcj/convert/UnicodeToBytes.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class Output_UTF8;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::Output_UTF8 : public ::gnu::gcj::convert::UnicodeToBytes
+{
+
+public:
+  Output_UTF8();
+  virtual ::java::lang::String * getName();
+  virtual jint write(JArray< jchar > *, jint, jint);
+  virtual jboolean havePendingBytes();
+  jboolean __attribute__((aligned(__alignof__( ::gnu::gcj::convert::UnicodeToBytes)))) standardUTF8;
+public: // actually package-private
+  jchar hi_part;
+  jint value;
+  jint bytes_todo;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_Output_UTF8__
diff --git a/libjava/gnu/gcj/convert/Output_UnicodeLittleUnmarked.h b/libjava/gnu/gcj/convert/Output_UnicodeLittleUnmarked.h
new file mode 100644
index 00000000000..747846bd0a9
--- /dev/null
+++ b/libjava/gnu/gcj/convert/Output_UnicodeLittleUnmarked.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_Output_UnicodeLittleUnmarked__
+#define __gnu_gcj_convert_Output_UnicodeLittleUnmarked__
+
+#pragma interface
+
+#include <gnu/gcj/convert/UnicodeToBytes.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class Output_UnicodeLittleUnmarked;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::Output_UnicodeLittleUnmarked : public ::gnu::gcj::convert::UnicodeToBytes
+{
+
+public:
+  Output_UnicodeLittleUnmarked();
+  virtual ::java::lang::String * getName();
+  virtual jint write(JArray< jchar > *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_Output_UnicodeLittleUnmarked__
diff --git a/libjava/gnu/gcj/convert/Output_iconv.h b/libjava/gnu/gcj/convert/Output_iconv.h
new file mode 100644
index 00000000000..a06f96b0d9f
--- /dev/null
+++ b/libjava/gnu/gcj/convert/Output_iconv.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_Output_iconv__
+#define __gnu_gcj_convert_Output_iconv__
+
+#pragma interface
+
+#include <gnu/gcj/convert/UnicodeToBytes.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+        class RawData;
+      namespace convert
+      {
+          class Output_iconv;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::Output_iconv : public ::gnu::gcj::convert::UnicodeToBytes
+{
+
+public:
+  Output_iconv(::java::lang::String *);
+  virtual ::java::lang::String * getName();
+  virtual void finalize();
+private:
+  void init(::java::lang::String *);
+public:
+  virtual jint write(JArray< jchar > *, jint, jint);
+  virtual void done();
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::gcj::convert::UnicodeToBytes)))) encoding;
+  ::gnu::gcj::RawData * handle;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_Output_iconv__
diff --git a/libjava/gnu/gcj/convert/UnicodeToBytes.h b/libjava/gnu/gcj/convert/UnicodeToBytes.h
new file mode 100644
index 00000000000..ea3a38ca507
--- /dev/null
+++ b/libjava/gnu/gcj/convert/UnicodeToBytes.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_convert_UnicodeToBytes__
+#define __gnu_gcj_convert_UnicodeToBytes__
+
+#pragma interface
+
+#include <gnu/gcj/convert/IOConverter.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace convert
+      {
+          class UnicodeToBytes;
+      }
+    }
+  }
+}
+
+class gnu::gcj::convert::UnicodeToBytes : public ::gnu::gcj::convert::IOConverter
+{
+
+public:
+  UnicodeToBytes();
+  virtual ::java::lang::String * getName() = 0;
+  static ::gnu::gcj::convert::UnicodeToBytes * getDefaultEncoder();
+  static ::gnu::gcj::convert::UnicodeToBytes * getEncoder(::java::lang::String *);
+  virtual void setOutput(JArray< jbyte > *, jint);
+  virtual jint write(JArray< jchar > *, jint, jint) = 0;
+  virtual jint write(::java::lang::String *, jint, jint, JArray< jchar > *);
+  virtual jboolean havePendingBytes();
+  virtual void setFinished();
+  virtual void done();
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::gcj::convert::IOConverter)))) buf;
+  jint count;
+public: // actually package-private
+  static ::java::lang::String * defaultEncoding;
+private:
+  static const jint CACHE_SIZE = 4;
+  static JArray< ::gnu::gcj::convert::UnicodeToBytes * > * encoderCache;
+  static jint currCachePos;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_convert_UnicodeToBytes__
diff --git a/libjava/gnu/gcj/convert/Unicode_to_JIS.cc b/libjava/gnu/gcj/convert/Unicode_to_JIS.cc
index ad99bb726af..10b3b7003db 100644
--- a/libjava/gnu/gcj/convert/Unicode_to_JIS.cc
+++ b/libjava/gnu/gcj/convert/Unicode_to_JIS.cc
@@ -1,5 +1,4 @@
 /* This file is automatically generated. */
-#pragma GCC java_exceptions
 unsigned short Unicode_to_JIS[] = {
  /* branch: 0x0XXX */ 16,
  /* branch: 0x1XXX */ 0,
diff --git a/libjava/gnu/gcj/convert/natIconv.cc b/libjava/gnu/gcj/convert/natIconv.cc
index 6c64e2b4bf9..ad75a505ff8 100644
--- a/libjava/gnu/gcj/convert/natIconv.cc
+++ b/libjava/gnu/gcj/convert/natIconv.cc
@@ -1,6 +1,6 @@
 // natIconv.cc -- Java side of iconv() reader.
 
-/* Copyright (C) 2000, 2001, 2003  Free Software Foundation
+/* Copyright (C) 2000, 2001, 2003, 2006  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -47,13 +47,13 @@ gnu::gcj::convert::Input_iconv::init (jstring encoding)
 
   iconv_t h = iconv_open ("UCS-2", buffer);
   if (h == (iconv_t) -1)
-    throw new java::io::UnsupportedEncodingException (encoding);
+    throw new ::java::io::UnsupportedEncodingException (encoding);
 
   JvAssert (h != NULL);
   handle = reinterpret_cast<gnu::gcj::RawData *> (h);
 #else /* HAVE_ICONV */
   // If no iconv, just throw an exception.
-  throw new java::io::UnsupportedEncodingException (encoding);
+  throw new ::java::io::UnsupportedEncodingException (encoding);
 #endif /* HAVE_ICONV */
 }
 
@@ -96,7 +96,7 @@ gnu::gcj::convert::Input_iconv::read (jcharArray outbuffer,
       // some conversion might have taken place.  So we fall through
       // to the normal case.
       if (errno != EINVAL && errno != E2BIG)
-	throw new java::io::CharConversionException ();
+	throw new ::java::io::CharConversionException ();
     }
 
   if (iconv_byte_swap)
@@ -147,13 +147,13 @@ gnu::gcj::convert::Output_iconv::init (jstring encoding)
 
   iconv_t h = iconv_open (buffer, "UCS-2");
   if (h == (iconv_t) -1)
-    throw new java::io::UnsupportedEncodingException (encoding);
+    throw new ::java::io::UnsupportedEncodingException (encoding);
 
   JvAssert (h != NULL);
   handle = reinterpret_cast<gnu::gcj::RawData *> (h);
 #else /* HAVE_ICONV */
   // If no iconv, just throw an exception.
-  throw new java::io::UnsupportedEncodingException (encoding);
+  throw new ::java::io::UnsupportedEncodingException (encoding);
 #endif /* HAVE_ICONV */
 }
 
diff --git a/libjava/gnu/gcj/io/DefaultMimeTypes.h b/libjava/gnu/gcj/io/DefaultMimeTypes.h
new file mode 100644
index 00000000000..5c09838b685
--- /dev/null
+++ b/libjava/gnu/gcj/io/DefaultMimeTypes.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_io_DefaultMimeTypes__
+#define __gnu_gcj_io_DefaultMimeTypes__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace io
+      {
+          class DefaultMimeTypes;
+      }
+    }
+  }
+}
+
+class gnu::gcj::io::DefaultMimeTypes : public ::java::lang::Object
+{
+
+public:
+  DefaultMimeTypes();
+  static JArray< ::java::lang::String * > * types;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_io_DefaultMimeTypes__
diff --git a/libjava/gnu/gcj/io/MimeTypes.h b/libjava/gnu/gcj/io/MimeTypes.h
new file mode 100644
index 00000000000..8ff48701261
--- /dev/null
+++ b/libjava/gnu/gcj/io/MimeTypes.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_io_MimeTypes__
+#define __gnu_gcj_io_MimeTypes__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace io
+      {
+          class MimeTypes;
+      }
+    }
+  }
+}
+
+class gnu::gcj::io::MimeTypes : public ::java::lang::Object
+{
+
+public:
+  MimeTypes();
+  static void fillFromFile(::java::util::Hashtable *, ::java::lang::String *);
+  static ::java::lang::String * getMimeTypeFromExtension(::java::lang::String *);
+private:
+  static ::java::util::Hashtable * mime_types;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_io_MimeTypes__
diff --git a/libjava/gnu/gcj/io/SimpleSHSStream.h b/libjava/gnu/gcj/io/SimpleSHSStream.h
new file mode 100644
index 00000000000..3cabc4aa046
--- /dev/null
+++ b/libjava/gnu/gcj/io/SimpleSHSStream.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_io_SimpleSHSStream__
+#define __gnu_gcj_io_SimpleSHSStream__
+
+#pragma interface
+
+#include <java/io/DataOutputStream.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace io
+      {
+          class SimpleSHSStream;
+      }
+    }
+  }
+}
+
+class gnu::gcj::io::SimpleSHSStream : public ::java::io::DataOutputStream
+{
+
+public: // actually package-private
+  static JArray< jbyte > * shsFinal(JArray< jbyte > *);
+  static void shsUpdate(JArray< jbyte > *, JArray< jbyte > *, jint);
+  static JArray< jbyte > * shsInit();
+private:
+  void update(jbyte);
+public:
+  virtual void write(jint);
+  virtual void write(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * digest();
+  SimpleSHSStream(::java::io::OutputStream *);
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::java::io::DataOutputStream)))) counter;
+  const jint SHS_BLOCKSIZE;
+  const jint SHS_DIGESTSIZE;
+  JArray< jbyte > * buf;
+  JArray< jbyte > * shs_info;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_io_SimpleSHSStream__
diff --git a/libjava/gnu/gcj/jvmti/Breakpoint.h b/libjava/gnu/gcj/jvmti/Breakpoint.h
new file mode 100644
index 00000000000..ebdd8555366
--- /dev/null
+++ b/libjava/gnu/gcj/jvmti/Breakpoint.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_jvmti_Breakpoint__
+#define __gnu_gcj_jvmti_Breakpoint__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+        class RawDataManaged;
+      namespace jvmti
+      {
+          class Breakpoint;
+      }
+    }
+  }
+}
+
+class gnu::gcj::jvmti::Breakpoint : public ::java::lang::Object
+{
+
+public:
+  Breakpoint(jlong, jlong);
+private:
+  void initialize_native();
+public:
+  virtual void install();
+  virtual void remove();
+  virtual ::gnu::gcj::RawDataManaged * getInsn();
+private:
+  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) method;
+  jlong location;
+  ::gnu::gcj::RawDataManaged * data;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_jvmti_Breakpoint__
diff --git a/libjava/gnu/gcj/jvmti/BreakpointManager.h b/libjava/gnu/gcj/jvmti/BreakpointManager.h
new file mode 100644
index 00000000000..d53be50d24b
--- /dev/null
+++ b/libjava/gnu/gcj/jvmti/BreakpointManager.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_jvmti_BreakpointManager__
+#define __gnu_gcj_jvmti_BreakpointManager__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace jvmti
+      {
+          class Breakpoint;
+          class BreakpointManager;
+      }
+    }
+  }
+}
+
+class gnu::gcj::jvmti::BreakpointManager : public ::java::lang::Object
+{
+
+  BreakpointManager();
+public:
+  static ::gnu::gcj::jvmti::Breakpoint * newBreakpoint(jlong, jlong);
+  static void deleteBreakpoint(jlong, jlong);
+  static ::gnu::gcj::jvmti::Breakpoint * getBreakpoint(jlong, jlong);
+private:
+  static ::gnu::gcj::jvmti::BreakpointManager * _instance;
+  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) _breakpoints;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_jvmti_BreakpointManager__
diff --git a/libjava/gnu/gcj/jvmti/Location.h b/libjava/gnu/gcj/jvmti/Location.h
new file mode 100644
index 00000000000..7a00a2d2662
--- /dev/null
+++ b/libjava/gnu/gcj/jvmti/Location.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_jvmti_Location__
+#define __gnu_gcj_jvmti_Location__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace jvmti
+      {
+          class Location;
+      }
+    }
+  }
+}
+
+class gnu::gcj::jvmti::Location : public ::java::lang::Object
+{
+
+public:
+  Location(jlong, jlong);
+  virtual jint hashCode();
+  virtual jboolean equals(::java::lang::Object *);
+  virtual ::java::lang::String * toString();
+private:
+  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) method;
+  jlong location;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_jvmti_Location__
diff --git a/libjava/gnu/gcj/natCore.cc b/libjava/gnu/gcj/natCore.cc
index 714e539085a..2d650f7101d 100644
--- a/libjava/gnu/gcj/natCore.cc
+++ b/libjava/gnu/gcj/natCore.cc
@@ -1,6 +1,6 @@
 // natCore -- C++ side of Core
 
-/* Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation
+/* Copyright (C) 2001, 2002, 2003, 2005, 2006  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -115,6 +115,6 @@ gnu::gcj::Core::create (jstring name)
 {
   gnu::gcj::Core *core = _Jv_create_core (root, name);
   if (core == NULL)
-    throw new java::io::IOException (JvNewStringLatin1 ("can't open core"));
+    throw new ::java::io::IOException (JvNewStringLatin1 ("can't open core"));
   return core;
 }
diff --git a/libjava/gnu/gcj/runtime/BootClassLoader.h b/libjava/gnu/gcj/runtime/BootClassLoader.h
new file mode 100644
index 00000000000..dbfd1567162
--- /dev/null
+++ b/libjava/gnu/gcj/runtime/BootClassLoader.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_runtime_BootClassLoader__
+#define __gnu_gcj_runtime_BootClassLoader__
+
+#pragma interface
+
+#include <gnu/gcj/runtime/HelperClassLoader.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace runtime
+      {
+          class BootClassLoader;
+      }
+    }
+  }
+  namespace java
+  {
+    namespace net
+    {
+        class URL;
+    }
+  }
+}
+
+class gnu::gcj::runtime::BootClassLoader : public ::gnu::gcj::runtime::HelperClassLoader
+{
+
+public: // actually package-private
+  BootClassLoader(::java::lang::String *);
+public:
+  ::java::lang::Class * bootLoadClass(::java::lang::String *);
+  ::java::net::URL * bootGetResource(::java::lang::String *);
+  ::java::util::Enumeration * bootGetResources(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_runtime_BootClassLoader__
diff --git a/libjava/gnu/gcj/runtime/ExtensionClassLoader.h b/libjava/gnu/gcj/runtime/ExtensionClassLoader.h
new file mode 100644
index 00000000000..ee17c2d845c
--- /dev/null
+++ b/libjava/gnu/gcj/runtime/ExtensionClassLoader.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_runtime_ExtensionClassLoader__
+#define __gnu_gcj_runtime_ExtensionClassLoader__
+
+#pragma interface
+
+#include <gnu/gcj/runtime/HelperClassLoader.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace runtime
+      {
+          class ExtensionClassLoader;
+          class SystemClassLoader;
+      }
+    }
+  }
+}
+
+class gnu::gcj::runtime::ExtensionClassLoader : public ::gnu::gcj::runtime::HelperClassLoader
+{
+
+  ExtensionClassLoader();
+  void init();
+public: // actually package-private
+  static void initialize();
+  static ::gnu::gcj::runtime::ExtensionClassLoader * instance;
+  static ::gnu::gcj::runtime::SystemClassLoader * system_instance;
+public:
+  static ::java::lang::Class class$;
+
+  friend class ::java::lang::ClassLoader;
+};
+
+#endif // __gnu_gcj_runtime_ExtensionClassLoader__
diff --git a/libjava/gnu/gcj/runtime/FinalizerThread.h b/libjava/gnu/gcj/runtime/FinalizerThread.h
new file mode 100644
index 00000000000..572f89d598d
--- /dev/null
+++ b/libjava/gnu/gcj/runtime/FinalizerThread.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_runtime_FinalizerThread__
+#define __gnu_gcj_runtime_FinalizerThread__
+
+#pragma interface
+
+#include <java/lang/Thread.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace runtime
+      {
+          class FinalizerThread;
+      }
+    }
+  }
+}
+
+class gnu::gcj::runtime::FinalizerThread : public ::java::lang::Thread
+{
+
+public:
+  FinalizerThread();
+private:
+  void init();
+public: // actually package-private
+  static void finalizerReady();
+public:
+  void run();
+private:
+  static jboolean finalizer_ready;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_runtime_FinalizerThread__
diff --git a/libjava/gnu/gcj/runtime/HelperClassLoader$1.h b/libjava/gnu/gcj/runtime/HelperClassLoader$1.h
new file mode 100644
index 00000000000..8b53b5afc4d
--- /dev/null
+++ b/libjava/gnu/gcj/runtime/HelperClassLoader$1.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_runtime_HelperClassLoader$1__
+#define __gnu_gcj_runtime_HelperClassLoader$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace runtime
+      {
+          class HelperClassLoader;
+          class HelperClassLoader$1;
+      }
+    }
+  }
+}
+
+class gnu::gcj::runtime::HelperClassLoader$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  HelperClassLoader$1(::gnu::gcj::runtime::HelperClassLoader *);
+public:
+  jboolean accept(::java::io::File *, ::java::lang::String *);
+public: // actually package-private
+  ::gnu::gcj::runtime::HelperClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_runtime_HelperClassLoader$1__
diff --git a/libjava/gnu/gcj/runtime/HelperClassLoader.h b/libjava/gnu/gcj/runtime/HelperClassLoader.h
new file mode 100644
index 00000000000..30311d3f861
--- /dev/null
+++ b/libjava/gnu/gcj/runtime/HelperClassLoader.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_runtime_HelperClassLoader__
+#define __gnu_gcj_runtime_HelperClassLoader__
+
+#pragma interface
+
+#include <java/net/URLClassLoader.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace runtime
+      {
+          class HelperClassLoader;
+      }
+    }
+  }
+}
+
+class gnu::gcj::runtime::HelperClassLoader : public ::java::net::URLClassLoader
+{
+
+public: // actually package-private
+  HelperClassLoader();
+  HelperClassLoader(::java::lang::ClassLoader *);
+  virtual void addDirectoriesFromProperty(::java::lang::String *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_runtime_HelperClassLoader__
diff --git a/libjava/gnu/gcj/runtime/JNIWeakRef.h b/libjava/gnu/gcj/runtime/JNIWeakRef.h
new file mode 100644
index 00000000000..e23a59f6dbd
--- /dev/null
+++ b/libjava/gnu/gcj/runtime/JNIWeakRef.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_runtime_JNIWeakRef__
+#define __gnu_gcj_runtime_JNIWeakRef__
+
+#pragma interface
+
+#include <java/lang/ref/WeakReference.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace runtime
+      {
+          class JNIWeakRef;
+      }
+    }
+  }
+}
+
+class gnu::gcj::runtime::JNIWeakRef : public ::java::lang::ref::WeakReference
+{
+
+public:
+  JNIWeakRef(::java::lang::Object *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_runtime_JNIWeakRef__
diff --git a/libjava/gnu/gcj/runtime/NameFinder$Addr2Line.h b/libjava/gnu/gcj/runtime/NameFinder$Addr2Line.h
new file mode 100644
index 00000000000..7d5b5a34264
--- /dev/null
+++ b/libjava/gnu/gcj/runtime/NameFinder$Addr2Line.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_runtime_NameFinder$Addr2Line__
+#define __gnu_gcj_runtime_NameFinder$Addr2Line__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace runtime
+      {
+          class NameFinder;
+          class NameFinder$Addr2Line;
+      }
+    }
+  }
+}
+
+class gnu::gcj::runtime::NameFinder$Addr2Line : public ::java::lang::Object
+{
+
+public: // actually package-private
+  NameFinder$Addr2Line(::gnu::gcj::runtime::NameFinder *, ::java::lang::String *);
+  virtual void close();
+  ::java::lang::Process * __attribute__((aligned(__alignof__( ::java::lang::Object)))) proc;
+  ::java::io::BufferedWriter * out;
+  ::java::io::BufferedReader * in;
+  ::gnu::gcj::runtime::NameFinder * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_runtime_NameFinder$Addr2Line__
diff --git a/libjava/gnu/gcj/runtime/NameFinder.h b/libjava/gnu/gcj/runtime/NameFinder.h
new file mode 100644
index 00000000000..38fd98babe4
--- /dev/null
+++ b/libjava/gnu/gcj/runtime/NameFinder.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_runtime_NameFinder__
+#define __gnu_gcj_runtime_NameFinder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace runtime
+      {
+          class NameFinder;
+      }
+    }
+  }
+}
+
+class gnu::gcj::runtime::NameFinder : public ::java::lang::Object
+{
+
+public: // actually package-private
+  static jboolean showRaw();
+  static jboolean removeUnknown();
+public:
+  NameFinder();
+  virtual ::java::lang::String * getSourceFile();
+  virtual jint getLineNum();
+  virtual void lookup(::java::lang::String *, jlong);
+  static ::java::lang::String * demangleInterpreterMethod(::java::lang::String *, ::java::lang::String *);
+  virtual void close();
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) binaryFile;
+  ::java::lang::String * sourceFile;
+  jint lineNum;
+  ::java::util::HashMap * procs;
+  static ::java::util::Set * blacklist;
+  static jboolean use_addr2line;
+  static jboolean show_raw;
+  static jboolean remove_unknown;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_runtime_NameFinder__
diff --git a/libjava/gnu/gcj/runtime/PersistentByteMap$AccessMode.h b/libjava/gnu/gcj/runtime/PersistentByteMap$AccessMode.h
new file mode 100644
index 00000000000..2cd93fad80b
--- /dev/null
+++ b/libjava/gnu/gcj/runtime/PersistentByteMap$AccessMode.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_runtime_PersistentByteMap$AccessMode__
+#define __gnu_gcj_runtime_PersistentByteMap$AccessMode__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace runtime
+      {
+          class PersistentByteMap$AccessMode;
+      }
+    }
+  }
+  namespace java
+  {
+    namespace nio
+    {
+      namespace channels
+      {
+          class FileChannel$MapMode;
+      }
+    }
+  }
+}
+
+class gnu::gcj::runtime::PersistentByteMap$AccessMode : public ::java::lang::Object
+{
+
+  PersistentByteMap$AccessMode(::java::nio::channels::FileChannel$MapMode *);
+public: // actually package-private
+  static ::java::nio::channels::FileChannel$MapMode * access$0(::gnu::gcj::runtime::PersistentByteMap$AccessMode *);
+private:
+  ::java::nio::channels::FileChannel$MapMode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mapMode;
+public:
+  static ::gnu::gcj::runtime::PersistentByteMap$AccessMode * READ_ONLY;
+  static ::gnu::gcj::runtime::PersistentByteMap$AccessMode * READ_WRITE;
+  static ::gnu::gcj::runtime::PersistentByteMap$AccessMode * PRIVATE;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_runtime_PersistentByteMap$AccessMode__
diff --git a/libjava/gnu/gcj/runtime/PersistentByteMap$ByteWrapper.h b/libjava/gnu/gcj/runtime/PersistentByteMap$ByteWrapper.h
new file mode 100644
index 00000000000..39cad37d302
--- /dev/null
+++ b/libjava/gnu/gcj/runtime/PersistentByteMap$ByteWrapper.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_runtime_PersistentByteMap$ByteWrapper__
+#define __gnu_gcj_runtime_PersistentByteMap$ByteWrapper__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace runtime
+      {
+          class PersistentByteMap;
+          class PersistentByteMap$ByteWrapper;
+      }
+    }
+  }
+}
+
+class gnu::gcj::runtime::PersistentByteMap$ByteWrapper : public ::java::lang::Object
+{
+
+public:
+  PersistentByteMap$ByteWrapper(::gnu::gcj::runtime::PersistentByteMap *, JArray< jbyte > *);
+  jint hashCode();
+  jboolean equals(::java::lang::Object *);
+public: // actually package-private
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) bytes;
+  jint hash;
+  ::gnu::gcj::runtime::PersistentByteMap * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_runtime_PersistentByteMap$ByteWrapper__
diff --git a/libjava/gnu/gcj/runtime/PersistentByteMap$HashIterator.h b/libjava/gnu/gcj/runtime/PersistentByteMap$HashIterator.h
new file mode 100644
index 00000000000..65df6ceea3b
--- /dev/null
+++ b/libjava/gnu/gcj/runtime/PersistentByteMap$HashIterator.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_runtime_PersistentByteMap$HashIterator__
+#define __gnu_gcj_runtime_PersistentByteMap$HashIterator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace runtime
+      {
+          class PersistentByteMap;
+          class PersistentByteMap$HashIterator;
+      }
+    }
+  }
+}
+
+class gnu::gcj::runtime::PersistentByteMap$HashIterator : public ::java::lang::Object
+{
+
+public: // actually package-private
+  PersistentByteMap$HashIterator(::gnu::gcj::runtime::PersistentByteMap *, jint);
+public:
+  jboolean hasNext();
+  ::java::lang::Object * next();
+  void remove();
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) idx;
+  jint count;
+  jint type;
+public: // actually package-private
+  ::gnu::gcj::runtime::PersistentByteMap * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_runtime_PersistentByteMap$HashIterator__
diff --git a/libjava/gnu/gcj/runtime/PersistentByteMap$MapEntry.h b/libjava/gnu/gcj/runtime/PersistentByteMap$MapEntry.h
new file mode 100644
index 00000000000..7cb8b63f0f9
--- /dev/null
+++ b/libjava/gnu/gcj/runtime/PersistentByteMap$MapEntry.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_runtime_PersistentByteMap$MapEntry__
+#define __gnu_gcj_runtime_PersistentByteMap$MapEntry__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace runtime
+      {
+          class PersistentByteMap$MapEntry;
+      }
+    }
+  }
+}
+
+class gnu::gcj::runtime::PersistentByteMap$MapEntry : public ::java::lang::Object
+{
+
+public:
+  PersistentByteMap$MapEntry(jint, ::java::lang::Object *, ::java::lang::Object *);
+  ::java::lang::Object * getKey();
+  ::java::lang::Object * getValue();
+  jint getBucket();
+private:
+  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
+  ::java::lang::Object * value;
+  jint bucket;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_runtime_PersistentByteMap$MapEntry__
diff --git a/libjava/gnu/gcj/runtime/PersistentByteMap.h b/libjava/gnu/gcj/runtime/PersistentByteMap.h
new file mode 100644
index 00000000000..1bac1d2c086
--- /dev/null
+++ b/libjava/gnu/gcj/runtime/PersistentByteMap.h
@@ -0,0 +1,115 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_runtime_PersistentByteMap__
+#define __gnu_gcj_runtime_PersistentByteMap__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace runtime
+      {
+          class PersistentByteMap;
+          class PersistentByteMap$AccessMode;
+      }
+    }
+  }
+  namespace java
+  {
+    namespace nio
+    {
+        class MappedByteBuffer;
+      namespace channels
+      {
+          class FileChannel;
+      }
+    }
+  }
+}
+
+class gnu::gcj::runtime::PersistentByteMap : public ::java::lang::Object
+{
+
+  PersistentByteMap(::java::io::File *);
+public:
+  PersistentByteMap(::java::lang::String *, ::gnu::gcj::runtime::PersistentByteMap$AccessMode *);
+  PersistentByteMap(::java::io::File *, ::gnu::gcj::runtime::PersistentByteMap$AccessMode *);
+private:
+  void init(::gnu::gcj::runtime::PersistentByteMap *, ::java::io::File *, jint, jint);
+public:
+  static ::gnu::gcj::runtime::PersistentByteMap * emptyPersistentByteMap(::java::io::File *, jint, jint);
+private:
+  jint getWord(jint);
+  void putWord(jint, jint);
+public:
+  virtual ::java::util::Set * entrySet();
+private:
+  jint getBucket(jint);
+  jint getKeyPos(jint);
+  jint getValuePos(jint);
+  void putKeyPos(jint, jint);
+  void putValuePos(jint, jint);
+  JArray< jbyte > * getBytes(jint);
+  jint hash(JArray< jbyte > *);
+public:
+  virtual JArray< jbyte > * get(JArray< jbyte > *);
+  virtual void put(JArray< jbyte > *, JArray< jbyte > *);
+private:
+  jint addBytes(JArray< jbyte > *);
+public:
+  virtual ::java::util::Iterator * iterator(jint);
+  virtual jint size();
+  virtual jint stringTableSize();
+  virtual jint capacity();
+  virtual void force();
+  virtual ::java::io::File * getFile();
+  virtual void close();
+  virtual void putAll(::gnu::gcj::runtime::PersistentByteMap *);
+public: // actually package-private
+  static jint access$0(::gnu::gcj::runtime::PersistentByteMap *);
+  static jint access$1(::gnu::gcj::runtime::PersistentByteMap *);
+  static jint access$2(::gnu::gcj::runtime::PersistentByteMap *, jint);
+  static jint access$3(::gnu::gcj::runtime::PersistentByteMap *, jint);
+  static JArray< jbyte > * access$4(::gnu::gcj::runtime::PersistentByteMap *, jint);
+private:
+  ::java::nio::MappedByteBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buf;
+  static const jint MAGIC = 0;
+  static const jint VERSION = 4;
+  static const jint CAPACITY = 8;
+  static const jint TABLE_BASE = 12;
+  static const jint STRING_BASE = 16;
+  static const jint STRING_SIZE = 20;
+  static const jint FILE_SIZE = 24;
+  static const jint ELEMENTS = 28;
+  static const jint INT_SIZE = 4;
+  static const jint TABLE_ENTRY_SIZE = 8;
+  jint capacity__;
+  jint table_base;
+  jint string_base;
+  jint string_size;
+  jint file_size;
+  jint elements;
+  jlong length;
+  ::java::io::File * name;
+  static const jint UNUSED_ENTRY = -1;
+public:
+  static const jint KEYS = 0;
+  static const jint VALUES = 1;
+  static const jint ENTRIES = 2;
+private:
+  ::java::util::HashMap * values;
+public: // actually package-private
+  ::java::nio::channels::FileChannel * fc;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_runtime_PersistentByteMap__
diff --git a/libjava/gnu/gcj/runtime/SharedLibHelper.h b/libjava/gnu/gcj/runtime/SharedLibHelper.h
new file mode 100644
index 00000000000..b2900b7e0df
--- /dev/null
+++ b/libjava/gnu/gcj/runtime/SharedLibHelper.h
@@ -0,0 +1,76 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_runtime_SharedLibHelper__
+#define __gnu_gcj_runtime_SharedLibHelper__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+        class Core;
+        class RawData;
+      namespace runtime
+      {
+          class SharedLibHelper;
+      }
+    }
+  }
+  namespace java
+  {
+    namespace net
+    {
+        class URL;
+    }
+    namespace security
+    {
+        class CodeSource;
+        class ProtectionDomain;
+    }
+  }
+}
+
+class gnu::gcj::runtime::SharedLibHelper : public ::java::lang::Object
+{
+
+public: // actually package-private
+  SharedLibHelper(::java::lang::String *, ::java::lang::ClassLoader *, ::java::security::CodeSource *, ::java::security::ProtectionDomain *, jint);
+public:
+  static ::gnu::gcj::runtime::SharedLibHelper * findHelper(::java::lang::String *);
+public: // actually package-private
+  static void copyFile(::java::io::File *, ::java::io::File *);
+public:
+  static ::gnu::gcj::runtime::SharedLibHelper * findHelper(::java::lang::ClassLoader *, ::java::lang::String *, ::java::security::CodeSource *, jboolean);
+  static ::gnu::gcj::runtime::SharedLibHelper * findHelper(::java::lang::ClassLoader *, ::java::lang::String *, ::java::security::CodeSource *, ::java::security::ProtectionDomain *, jboolean);
+  virtual void finalize();
+  virtual ::java::lang::Class * findClass(::java::lang::String *);
+  virtual ::java::net::URL * findResource(::java::lang::String *);
+  virtual ::gnu::gcj::Core * findCore(::java::lang::String *);
+public: // actually package-private
+  virtual void ensureInit();
+  virtual jboolean hasResource(::java::lang::String *);
+  virtual void init();
+  virtual void ensureSupersLinked(::java::lang::Class *);
+public:
+  virtual ::java::lang::String * toString();
+public: // actually package-private
+  virtual void registerClass(::java::lang::String *, ::java::lang::Class *);
+  ::gnu::gcj::RawData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) handler;
+  ::gnu::gcj::RawData * core_chain;
+  ::java::util::HashMap * classMap;
+  ::java::lang::ClassLoader * loader;
+  ::java::lang::String * baseName;
+  ::java::security::ProtectionDomain * domain;
+  jint flags;
+  jboolean initialized;
+  static ::java::util::HashMap * map;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_runtime_SharedLibHelper__
diff --git a/libjava/gnu/gcj/runtime/SharedLibLoader.h b/libjava/gnu/gcj/runtime/SharedLibLoader.h
new file mode 100644
index 00000000000..8a439d3d3d7
--- /dev/null
+++ b/libjava/gnu/gcj/runtime/SharedLibLoader.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_runtime_SharedLibLoader__
+#define __gnu_gcj_runtime_SharedLibLoader__
+
+#pragma interface
+
+#include <java/lang/ClassLoader.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace runtime
+      {
+          class SharedLibHelper;
+          class SharedLibLoader;
+      }
+    }
+  }
+  namespace java
+  {
+    namespace net
+    {
+        class URL;
+    }
+  }
+}
+
+class gnu::gcj::runtime::SharedLibLoader : public ::java::lang::ClassLoader
+{
+
+public:
+  SharedLibLoader(::java::lang::String *, ::java::lang::ClassLoader *, jint);
+  SharedLibLoader(::java::lang::String *);
+  virtual ::java::lang::Class * findClass(::java::lang::String *);
+  virtual ::java::net::URL * findResource(::java::lang::String *);
+  virtual ::java::util::Enumeration * findResources(::java::lang::String *);
+public: // actually package-private
+  ::gnu::gcj::runtime::SharedLibHelper * __attribute__((aligned(__alignof__( ::java::lang::ClassLoader)))) helper;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_runtime_SharedLibLoader__
diff --git a/libjava/gnu/gcj/runtime/StringBuffer.h b/libjava/gnu/gcj/runtime/StringBuffer.h
new file mode 100644
index 00000000000..27a3a7e30fb
--- /dev/null
+++ b/libjava/gnu/gcj/runtime/StringBuffer.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_runtime_StringBuffer__
+#define __gnu_gcj_runtime_StringBuffer__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace runtime
+      {
+          class StringBuffer;
+      }
+    }
+  }
+}
+
+class gnu::gcj::runtime::StringBuffer : public ::java::lang::Object
+{
+
+public:
+  ::gnu::gcj::runtime::StringBuffer * append(jboolean);
+  ::gnu::gcj::runtime::StringBuffer * append(jchar);
+  ::gnu::gcj::runtime::StringBuffer * append(jint);
+  ::gnu::gcj::runtime::StringBuffer * append(jlong);
+  ::gnu::gcj::runtime::StringBuffer * append(jfloat);
+  ::gnu::gcj::runtime::StringBuffer * append(jdouble);
+  ::gnu::gcj::runtime::StringBuffer * append(::java::lang::Object *);
+  ::gnu::gcj::runtime::StringBuffer * append(::java::lang::String *);
+private:
+  void ensureCapacity_unsynchronized(jint);
+public:
+  StringBuffer();
+  StringBuffer(jint);
+  StringBuffer(::java::lang::String *);
+  ::java::lang::String * toString();
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
+  JArray< jchar > * value;
+private:
+  static const jint DEFAULT_CAPACITY = 16;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_runtime_StringBuffer__
diff --git a/libjava/gnu/gcj/runtime/SystemClassLoader.h b/libjava/gnu/gcj/runtime/SystemClassLoader.h
new file mode 100644
index 00000000000..58c709659e8
--- /dev/null
+++ b/libjava/gnu/gcj/runtime/SystemClassLoader.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_runtime_SystemClassLoader__
+#define __gnu_gcj_runtime_SystemClassLoader__
+
+#pragma interface
+
+#include <java/net/URLClassLoader.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace runtime
+      {
+          class SystemClassLoader;
+      }
+    }
+  }
+}
+
+class gnu::gcj::runtime::SystemClassLoader : public ::java::net::URLClassLoader
+{
+
+public: // actually package-private
+  SystemClassLoader(::java::lang::ClassLoader *);
+  void addClass(::java::lang::Class *);
+public: // actually protected
+  ::java::lang::Class * findClass(::java::lang::String *);
+public: // actually package-private
+  void init();
+private:
+  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader)))) nativeClasses;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_runtime_SystemClassLoader__
diff --git a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc
index e20ccb9e336..0d8d0e8341b 100644
--- a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc
+++ b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc
@@ -87,9 +87,9 @@ gnu::gcj::runtime::SharedLibHelper::init(void)
 
   if (flags==0)
     flags = RTLD_GLOBAL | RTLD_LAZY;
-  JvSynchronize dummy1(&java::lang::Class::class$);
+  JvSynchronize dummy1(&::java::lang::Class::class$);
   SharedLibDummy dummy2;
-  curLoader = ((void*)loader == java::lang::VMClassLoader::bootLoader
+  curLoader = ((void*)loader == ::java::lang::VMClassLoader::bootLoader
 	       ? NULL : loader);
   curHelper = this;
   _Jv_RegisterClassHook = _Jv_sharedlib_register_hook;
@@ -98,13 +98,13 @@ gnu::gcj::runtime::SharedLibHelper::init(void)
   if (h == NULL)
     {
       const char *msg = dlerror();
-      throw new java::lang::UnknownError(JvNewStringLatin1(msg));
+      throw new ::java::lang::UnknownError(JvNewStringLatin1(msg));
     }
   handler = (gnu::gcj::RawData*) h;
 #else
   const char *msg
     = "shared library class loading is not supported on this platform";
-  throw new java::lang::UnsupportedOperationException(JvNewStringLatin1(msg));
+  throw new ::java::lang::UnsupportedOperationException(JvNewStringLatin1(msg));
 #endif
 }
 
diff --git a/libjava/gnu/gcj/tools/gcj_dbtool/Fileset.h b/libjava/gnu/gcj/tools/gcj_dbtool/Fileset.h
new file mode 100644
index 00000000000..fb9b2d69eed
--- /dev/null
+++ b/libjava/gnu/gcj/tools/gcj_dbtool/Fileset.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_tools_gcj_dbtool_Fileset__
+#define __gnu_gcj_tools_gcj_dbtool_Fileset__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace tools
+      {
+        namespace gcj_dbtool
+        {
+            class Fileset;
+        }
+      }
+    }
+  }
+}
+
+class gnu::gcj::tools::gcj_dbtool::Fileset : public ::java::lang::Object
+{
+
+public: // actually package-private
+  Fileset(JArray< ::java::lang::String * > *, jint, jint);
+  Fileset(::java::io::InputStream *, jchar);
+  virtual ::java::util::Iterator * iterator();
+  virtual jint size();
+  ::java::util::LinkedHashSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) files;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_tools_gcj_dbtool_Fileset__
diff --git a/libjava/gnu/gcj/tools/gcj_dbtool/Main.h b/libjava/gnu/gcj/tools/gcj_dbtool/Main.h
new file mode 100644
index 00000000000..4052bb34c00
--- /dev/null
+++ b/libjava/gnu/gcj/tools/gcj_dbtool/Main.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_tools_gcj_dbtool_Main__
+#define __gnu_gcj_tools_gcj_dbtool_Main__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace runtime
+      {
+          class PersistentByteMap;
+      }
+      namespace tools
+      {
+        namespace gcj_dbtool
+        {
+            class Fileset;
+            class Main;
+        }
+      }
+    }
+  }
+}
+
+class gnu::gcj::tools::gcj_dbtool::Main : public ::java::lang::Object
+{
+
+public:
+  Main();
+  static void main(JArray< ::java::lang::String * > *);
+private:
+  static ::java::lang::String * getDbPathTail();
+  static void insist(jboolean);
+  static void usage(::java::io::PrintStream *);
+  static ::gnu::gcj::runtime::PersistentByteMap * addJar(::java::io::File *, ::gnu::gcj::runtime::PersistentByteMap *, ::java::io::File *);
+public: // actually package-private
+  static ::gnu::gcj::runtime::PersistentByteMap * resizeMap(::gnu::gcj::runtime::PersistentByteMap *, jint, jboolean);
+  static ::java::lang::String * bytesToString(JArray< jbyte > *);
+private:
+  static ::gnu::gcj::tools::gcj_dbtool::Fileset * getFiles(JArray< ::java::lang::String * > *, jint, jboolean, jchar);
+  static jboolean verbose;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_tools_gcj_dbtool_Main__
diff --git a/libjava/gnu/gcj/tools/gcj_dbtool/Tokenizer.h b/libjava/gnu/gcj/tools/gcj_dbtool/Tokenizer.h
new file mode 100644
index 00000000000..7c5c411bb94
--- /dev/null
+++ b/libjava/gnu/gcj/tools/gcj_dbtool/Tokenizer.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_tools_gcj_dbtool_Tokenizer__
+#define __gnu_gcj_tools_gcj_dbtool_Tokenizer__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace tools
+      {
+        namespace gcj_dbtool
+        {
+            class Tokenizer;
+        }
+      }
+    }
+  }
+}
+
+class gnu::gcj::tools::gcj_dbtool::Tokenizer : public ::java::lang::Object
+{
+
+public: // actually package-private
+  Tokenizer(::java::io::Reader *, jchar);
+  virtual jboolean isSeparator(jint);
+  virtual ::java::lang::String * nextToken();
+  ::java::io::Reader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) r;
+  jchar separator;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_tools_gcj_dbtool_Tokenizer__
diff --git a/libjava/gnu/gcj/util/Debug.h b/libjava/gnu/gcj/util/Debug.h
new file mode 100644
index 00000000000..3ad59ef6d60
--- /dev/null
+++ b/libjava/gnu/gcj/util/Debug.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_gcj_util_Debug__
+#define __gnu_gcj_util_Debug__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+      namespace util
+      {
+          class Debug;
+      }
+    }
+  }
+}
+
+class gnu::gcj::util::Debug : public ::java::lang::Object
+{
+
+public: // actually package-private
+  Debug(::java::io::PrintStream *, jint, jint, jboolean);
+  Debug(::java::io::PrintStream *);
+  Debug(jint, jboolean);
+  Debug(jint);
+  Debug();
+private:
+  void indent();
+  static JArray< ::java::lang::reflect::Field * > * getDeclaredFields(::java::lang::Class *);
+  static ::java::lang::Object * getField(::java::lang::Object *, ::java::lang::reflect::Field *);
+  static jlong getAddr(::java::lang::Object *);
+  JArray< ::java::lang::reflect::Field * > * internalGetFields(::java::lang::Class *);
+  static ::java::lang::Class * getItsClass(::java::lang::Object *);
+  void print(::java::lang::Object *);
+  void print0(::java::lang::Object *, ::java::lang::Class *);
+public:
+  virtual void write(::java::lang::Object *);
+private:
+  ::java::io::PrintStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) p;
+  jint maxdepth;
+  jint maxArrayLength;
+  jboolean printStaticFields;
+  jint depth;
+  ::java::util::IdentityHashMap * h;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_gcj_util_Debug__