15 files changed, 715 insertions, 0 deletions
diff --git a/libjava/java/nio/charset/CharacterCodingException.h b/libjava/java/nio/charset/CharacterCodingException.h
new file mode 100644
index 00000000000..35935cd1fb3
--- /dev/null
+++ b/libjava/java/nio/charset/CharacterCodingException.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_nio_charset_CharacterCodingException__
+#define __java_nio_charset_CharacterCodingException__
+
+#pragma interface
+
+#include <java/io/IOException.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+      namespace charset
+      {
+          class CharacterCodingException;
+      }
+    }
+  }
+}
+
+class java::nio::charset::CharacterCodingException : public ::java::io::IOException
+{
+
+public:
+  CharacterCodingException();
+private:
+  static const jlong serialVersionUID = 8421532232154627783LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_nio_charset_CharacterCodingException__
diff --git a/libjava/java/nio/charset/Charset.h b/libjava/java/nio/charset/Charset.h
new file mode 100644
index 00000000000..62e4f647d7c
--- /dev/null
+++ b/libjava/java/nio/charset/Charset.h
@@ -0,0 +1,79 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_nio_charset_Charset__
+#define __java_nio_charset_Charset__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+        class ByteBuffer;
+        class CharBuffer;
+      namespace charset
+      {
+          class Charset;
+          class CharsetDecoder;
+          class CharsetEncoder;
+        namespace spi
+        {
+            class CharsetProvider;
+        }
+      }
+    }
+  }
+}
+
+class java::nio::charset::Charset : public ::java::lang::Object
+{
+
+public: // actually protected
+  Charset(::java::lang::String *, JArray< ::java::lang::String * > *);
+private:
+  static void checkName(::java::lang::String *);
+public:
+  static ::java::nio::charset::Charset * defaultCharset();
+  static jboolean isSupported(::java::lang::String *);
+  static ::java::nio::charset::Charset * forName(::java::lang::String *);
+private:
+  static ::java::nio::charset::Charset * charsetForName(::java::lang::String *);
+public:
+  static ::java::util::SortedMap * availableCharsets();
+private:
+  static ::java::nio::charset::spi::CharsetProvider * provider();
+  static JArray< ::java::nio::charset::spi::CharsetProvider * > * providers2();
+public:
+  virtual ::java::lang::String * name();
+  virtual ::java::util::Set * aliases();
+  virtual ::java::lang::String * displayName();
+  virtual ::java::lang::String * displayName(::java::util::Locale *);
+  virtual jboolean isRegistered();
+  virtual jboolean contains(::java::nio::charset::Charset *) = 0;
+  virtual ::java::nio::charset::CharsetDecoder * newDecoder() = 0;
+  virtual ::java::nio::charset::CharsetEncoder * newEncoder() = 0;
+  virtual jboolean canEncode();
+  virtual ::java::nio::ByteBuffer * encode(::java::nio::CharBuffer *);
+  virtual ::java::nio::ByteBuffer * encode(::java::lang::String *);
+  virtual ::java::nio::CharBuffer * decode(::java::nio::ByteBuffer *);
+  virtual jint compareTo(::java::lang::Object *);
+  virtual jint hashCode();
+  virtual jboolean equals(::java::lang::Object *);
+  virtual ::java::lang::String * toString();
+private:
+  ::java::nio::charset::CharsetEncoder * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cachedEncoder;
+  ::java::nio::charset::CharsetDecoder * cachedDecoder;
+  static JArray< ::java::nio::charset::spi::CharsetProvider * > * providers;
+  ::java::lang::String * canonicalName;
+  JArray< ::java::lang::String * > * aliases__;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_nio_charset_Charset__
diff --git a/libjava/java/nio/charset/CharsetDecoder.h b/libjava/java/nio/charset/CharsetDecoder.h
new file mode 100644
index 00000000000..fe75d48a532
--- /dev/null
+++ b/libjava/java/nio/charset/CharsetDecoder.h
@@ -0,0 +1,81 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_nio_charset_CharsetDecoder__
+#define __java_nio_charset_CharsetDecoder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+        class ByteBuffer;
+        class CharBuffer;
+      namespace charset
+      {
+          class Charset;
+          class CharsetDecoder;
+          class CoderResult;
+          class CodingErrorAction;
+      }
+    }
+  }
+}
+
+class java::nio::charset::CharsetDecoder : public ::java::lang::Object
+{
+
+  CharsetDecoder(::java::nio::charset::Charset *, jfloat, jfloat, ::java::lang::String *);
+public: // actually protected
+  CharsetDecoder(::java::nio::charset::Charset *, jfloat, jfloat);
+public:
+  virtual jfloat averageCharsPerByte();
+  virtual ::java::nio::charset::Charset * charset();
+  virtual ::java::nio::CharBuffer * decode(::java::nio::ByteBuffer *);
+  virtual ::java::nio::charset::CoderResult * decode(::java::nio::ByteBuffer *, ::java::nio::CharBuffer *, jboolean);
+public: // actually protected
+  virtual ::java::nio::charset::CoderResult * decodeLoop(::java::nio::ByteBuffer *, ::java::nio::CharBuffer *) = 0;
+public:
+  virtual ::java::nio::charset::Charset * detectedCharset();
+  virtual ::java::nio::charset::CoderResult * flush(::java::nio::CharBuffer *);
+public: // actually protected
+  virtual ::java::nio::charset::CoderResult * implFlush(::java::nio::CharBuffer *);
+public:
+  virtual ::java::nio::charset::CharsetDecoder * onMalformedInput(::java::nio::charset::CodingErrorAction *);
+public: // actually protected
+  virtual void implOnMalformedInput(::java::nio::charset::CodingErrorAction *);
+  virtual void implOnUnmappableCharacter(::java::nio::charset::CodingErrorAction *);
+  virtual void implReplaceWith(::java::lang::String *);
+  virtual void implReset();
+public:
+  virtual jboolean isAutoDetecting();
+  virtual jboolean isCharsetDetected();
+  virtual ::java::nio::charset::CodingErrorAction * malformedInputAction();
+  virtual jfloat maxCharsPerByte();
+  virtual ::java::nio::charset::CharsetDecoder * onUnmappableCharacter(::java::nio::charset::CodingErrorAction *);
+  virtual ::java::lang::String * replacement();
+  virtual ::java::nio::charset::CharsetDecoder * replaceWith(::java::lang::String *);
+  virtual ::java::nio::charset::CharsetDecoder * reset();
+  virtual ::java::nio::charset::CodingErrorAction * unmappableCharacterAction();
+private:
+  static const jint STATE_RESET = 0;
+  static const jint STATE_CODING = 1;
+  static const jint STATE_END = 2;
+  static const jint STATE_FLUSHED = 3;
+  static ::java::lang::String * DEFAULT_REPLACEMENT;
+  ::java::nio::charset::Charset * __attribute__((aligned(__alignof__( ::java::lang::Object)))) charset__;
+  jfloat averageCharsPerByte__;
+  jfloat maxCharsPerByte__;
+  ::java::lang::String * replacement__;
+  jint state;
+  ::java::nio::charset::CodingErrorAction * malformedInputAction__;
+  ::java::nio::charset::CodingErrorAction * unmappableCharacterAction__;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_nio_charset_CharsetDecoder__
diff --git a/libjava/java/nio/charset/CharsetEncoder.h b/libjava/java/nio/charset/CharsetEncoder.h
new file mode 100644
index 00000000000..5a64e44f748
--- /dev/null
+++ b/libjava/java/nio/charset/CharsetEncoder.h
@@ -0,0 +1,84 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_nio_charset_CharsetEncoder__
+#define __java_nio_charset_CharsetEncoder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+        class ByteBuffer;
+        class CharBuffer;
+      namespace charset
+      {
+          class Charset;
+          class CharsetEncoder;
+          class CoderResult;
+          class CodingErrorAction;
+      }
+    }
+  }
+}
+
+class java::nio::charset::CharsetEncoder : public ::java::lang::Object
+{
+
+public: // actually protected
+  CharsetEncoder(::java::nio::charset::Charset *, jfloat, jfloat);
+  CharsetEncoder(::java::nio::charset::Charset *, jfloat, jfloat, JArray< jbyte > *);
+public:
+  virtual jfloat averageBytesPerChar();
+  virtual jboolean canEncode(jchar);
+  virtual jboolean canEncode(::java::lang::CharSequence *);
+private:
+  jboolean canEncode(::java::nio::CharBuffer *);
+public:
+  virtual ::java::nio::charset::Charset * charset();
+  virtual ::java::nio::ByteBuffer * encode(::java::nio::CharBuffer *);
+  virtual ::java::nio::charset::CoderResult * encode(::java::nio::CharBuffer *, ::java::nio::ByteBuffer *, jboolean);
+public: // actually protected
+  virtual ::java::nio::charset::CoderResult * encodeLoop(::java::nio::CharBuffer *, ::java::nio::ByteBuffer *) = 0;
+public:
+  virtual ::java::nio::charset::CoderResult * flush(::java::nio::ByteBuffer *);
+public: // actually protected
+  virtual ::java::nio::charset::CoderResult * implFlush(::java::nio::ByteBuffer *);
+  virtual void implOnMalformedInput(::java::nio::charset::CodingErrorAction *);
+  virtual void implOnUnmappableCharacter(::java::nio::charset::CodingErrorAction *);
+  virtual void implReplaceWith(JArray< jbyte > *);
+  virtual void implReset();
+public:
+  virtual jboolean isLegalReplacement(JArray< jbyte > *);
+  virtual ::java::nio::charset::CodingErrorAction * malformedInputAction();
+  virtual jfloat maxBytesPerChar();
+  virtual ::java::nio::charset::CharsetEncoder * onMalformedInput(::java::nio::charset::CodingErrorAction *);
+  virtual ::java::nio::charset::CodingErrorAction * unmappableCharacterAction();
+  virtual ::java::nio::charset::CharsetEncoder * onUnmappableCharacter(::java::nio::charset::CodingErrorAction *);
+  virtual JArray< jbyte > * replacement();
+  virtual ::java::nio::charset::CharsetEncoder * replaceWith(JArray< jbyte > *);
+  virtual ::java::nio::charset::CharsetEncoder * reset();
+private:
+  static const jint STATE_RESET = 0;
+  static const jint STATE_CODING = 1;
+  static const jint STATE_END = 2;
+  static const jint STATE_FLUSHED = 3;
+  static JArray< jbyte > * DEFAULT_REPLACEMENT;
+  ::java::nio::charset::Charset * __attribute__((aligned(__alignof__( ::java::lang::Object)))) charset__;
+  jfloat averageBytesPerChar__;
+  jfloat maxBytesPerChar__;
+  JArray< jbyte > * replacement__;
+  jint state;
+  ::java::nio::charset::CodingErrorAction * malformedInputAction__;
+  ::java::nio::charset::CodingErrorAction * unmappableCharacterAction__;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_nio_charset_CharsetEncoder__
diff --git a/libjava/java/nio/charset/CoderMalfunctionError.h b/libjava/java/nio/charset/CoderMalfunctionError.h
new file mode 100644
index 00000000000..b3ae83adf21
--- /dev/null
+++ b/libjava/java/nio/charset/CoderMalfunctionError.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_nio_charset_CoderMalfunctionError__
+#define __java_nio_charset_CoderMalfunctionError__
+
+#pragma interface
+
+#include <java/lang/Error.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+      namespace charset
+      {
+          class CoderMalfunctionError;
+      }
+    }
+  }
+}
+
+class java::nio::charset::CoderMalfunctionError : public ::java::lang::Error
+{
+
+public:
+  CoderMalfunctionError(::java::lang::Exception *);
+private:
+  static const jlong serialVersionUID = -1151412348057794301LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_nio_charset_CoderMalfunctionError__
diff --git a/libjava/java/nio/charset/CoderResult$1.h b/libjava/java/nio/charset/CoderResult$1.h
new file mode 100644
index 00000000000..a822a3fe1f9
--- /dev/null
+++ b/libjava/java/nio/charset/CoderResult$1.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_nio_charset_CoderResult$1__
+#define __java_nio_charset_CoderResult$1__
+
+#pragma interface
+
+#include <java/nio/charset/CoderResult$Cache.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+      namespace charset
+      {
+          class CoderResult;
+          class CoderResult$1;
+      }
+    }
+  }
+}
+
+class java::nio::charset::CoderResult$1 : public ::java::nio::charset::CoderResult$Cache
+{
+
+public: // actually package-private
+  CoderResult$1();
+public: // actually protected
+  ::java::nio::charset::CoderResult * make(jint);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_nio_charset_CoderResult$1__
diff --git a/libjava/java/nio/charset/CoderResult$2.h b/libjava/java/nio/charset/CoderResult$2.h
new file mode 100644
index 00000000000..15eae195815
--- /dev/null
+++ b/libjava/java/nio/charset/CoderResult$2.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_nio_charset_CoderResult$2__
+#define __java_nio_charset_CoderResult$2__
+
+#pragma interface
+
+#include <java/nio/charset/CoderResult$Cache.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+      namespace charset
+      {
+          class CoderResult;
+          class CoderResult$2;
+      }
+    }
+  }
+}
+
+class java::nio::charset::CoderResult$2 : public ::java::nio::charset::CoderResult$Cache
+{
+
+public: // actually package-private
+  CoderResult$2();
+public: // actually protected
+  ::java::nio::charset::CoderResult * make(jint);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_nio_charset_CoderResult$2__
diff --git a/libjava/java/nio/charset/CoderResult$Cache.h b/libjava/java/nio/charset/CoderResult$Cache.h
new file mode 100644
index 00000000000..38416bd9e22
--- /dev/null
+++ b/libjava/java/nio/charset/CoderResult$Cache.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_nio_charset_CoderResult$Cache__
+#define __java_nio_charset_CoderResult$Cache__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+      namespace charset
+      {
+          class CoderResult;
+          class CoderResult$Cache;
+      }
+    }
+  }
+}
+
+class java::nio::charset::CoderResult$Cache : public ::java::lang::Object
+{
+
+public: // actually package-private
+  CoderResult$Cache();
+  virtual ::java::nio::charset::CoderResult * get(jint);
+public: // actually protected
+  virtual ::java::nio::charset::CoderResult * make(jint) = 0;
+private:
+  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cache;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_nio_charset_CoderResult$Cache__
diff --git a/libjava/java/nio/charset/CoderResult.h b/libjava/java/nio/charset/CoderResult.h
new file mode 100644
index 00000000000..e2c84a61c16
--- /dev/null
+++ b/libjava/java/nio/charset/CoderResult.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_nio_charset_CoderResult__
+#define __java_nio_charset_CoderResult__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+      namespace charset
+      {
+          class CoderResult;
+          class CoderResult$Cache;
+      }
+    }
+  }
+}
+
+class java::nio::charset::CoderResult : public ::java::lang::Object
+{
+
+public: // actually package-private
+  CoderResult(jint, jint);
+public:
+  virtual jboolean isError();
+  virtual jboolean isMalformed();
+  virtual jboolean isOverflow();
+  virtual jboolean isUnderflow();
+  virtual jboolean isUnmappable();
+  virtual jint length();
+  static ::java::nio::charset::CoderResult * malformedForLength(jint);
+  virtual void throwException();
+  virtual ::java::lang::String * toString();
+  static ::java::nio::charset::CoderResult * unmappableForLength(jint);
+private:
+  static const jint TYPE_MALFORMED = 0;
+  static const jint TYPE_OVERFLOW = 1;
+  static const jint TYPE_UNDERFLOW = 2;
+  static const jint TYPE_UNMAPPABLE = 3;
+public:
+  static ::java::nio::charset::CoderResult * OVERFLOW;
+  static ::java::nio::charset::CoderResult * UNDERFLOW;
+private:
+  static JArray< ::java::lang::String * > * names;
+  static ::java::nio::charset::CoderResult$Cache * malformedCache;
+  static ::java::nio::charset::CoderResult$Cache * unmappableCache;
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
+  jint length__;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_nio_charset_CoderResult__
diff --git a/libjava/java/nio/charset/CodingErrorAction.h b/libjava/java/nio/charset/CodingErrorAction.h
new file mode 100644
index 00000000000..c0bf2aa666b
--- /dev/null
+++ b/libjava/java/nio/charset/CodingErrorAction.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_nio_charset_CodingErrorAction__
+#define __java_nio_charset_CodingErrorAction__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+      namespace charset
+      {
+          class CodingErrorAction;
+      }
+    }
+  }
+}
+
+class java::nio::charset::CodingErrorAction : public ::java::lang::Object
+{
+
+  CodingErrorAction(::java::lang::String *);
+public:
+  virtual ::java::lang::String * toString();
+  static ::java::nio::charset::CodingErrorAction * IGNORE;
+  static ::java::nio::charset::CodingErrorAction * REPLACE;
+  static ::java::nio::charset::CodingErrorAction * REPORT;
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_nio_charset_CodingErrorAction__
diff --git a/libjava/java/nio/charset/IllegalCharsetNameException.h b/libjava/java/nio/charset/IllegalCharsetNameException.h
new file mode 100644
index 00000000000..c4b42474fc6
--- /dev/null
+++ b/libjava/java/nio/charset/IllegalCharsetNameException.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_nio_charset_IllegalCharsetNameException__
+#define __java_nio_charset_IllegalCharsetNameException__
+
+#pragma interface
+
+#include <java/lang/IllegalArgumentException.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+      namespace charset
+      {
+          class IllegalCharsetNameException;
+      }
+    }
+  }
+}
+
+class java::nio::charset::IllegalCharsetNameException : public ::java::lang::IllegalArgumentException
+{
+
+public:
+  IllegalCharsetNameException(::java::lang::String *);
+  virtual ::java::lang::String * getCharsetName();
+private:
+  static const jlong serialVersionUID = 1457525358470002989LL;
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::IllegalArgumentException)))) charsetName;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_nio_charset_IllegalCharsetNameException__
diff --git a/libjava/java/nio/charset/MalformedInputException.h b/libjava/java/nio/charset/MalformedInputException.h
new file mode 100644
index 00000000000..03a6d8d9860
--- /dev/null
+++ b/libjava/java/nio/charset/MalformedInputException.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_nio_charset_MalformedInputException__
+#define __java_nio_charset_MalformedInputException__
+
+#pragma interface
+
+#include <java/nio/charset/CharacterCodingException.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+      namespace charset
+      {
+          class MalformedInputException;
+      }
+    }
+  }
+}
+
+class java::nio::charset::MalformedInputException : public ::java::nio::charset::CharacterCodingException
+{
+
+public:
+  MalformedInputException(jint);
+  virtual jint getInputLength();
+  virtual ::java::lang::String * getMessage();
+private:
+  static const jlong serialVersionUID = -3438823399834806194LL;
+  jint __attribute__((aligned(__alignof__( ::java::nio::charset::CharacterCodingException)))) inputLength;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_nio_charset_MalformedInputException__
diff --git a/libjava/java/nio/charset/UnmappableCharacterException.h b/libjava/java/nio/charset/UnmappableCharacterException.h
new file mode 100644
index 00000000000..f0ced263f33
--- /dev/null
+++ b/libjava/java/nio/charset/UnmappableCharacterException.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_nio_charset_UnmappableCharacterException__
+#define __java_nio_charset_UnmappableCharacterException__
+
+#pragma interface
+
+#include <java/nio/charset/CharacterCodingException.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+      namespace charset
+      {
+          class UnmappableCharacterException;
+      }
+    }
+  }
+}
+
+class java::nio::charset::UnmappableCharacterException : public ::java::nio::charset::CharacterCodingException
+{
+
+public:
+  UnmappableCharacterException(jint);
+  virtual jint getInputLength();
+  virtual ::java::lang::String * getMessage();
+private:
+  static const jlong serialVersionUID = -7026962371537706123LL;
+  jint __attribute__((aligned(__alignof__( ::java::nio::charset::CharacterCodingException)))) inputLength;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_nio_charset_UnmappableCharacterException__
diff --git a/libjava/java/nio/charset/UnsupportedCharsetException.h b/libjava/java/nio/charset/UnsupportedCharsetException.h
new file mode 100644
index 00000000000..7f09678feee
--- /dev/null
+++ b/libjava/java/nio/charset/UnsupportedCharsetException.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_nio_charset_UnsupportedCharsetException__
+#define __java_nio_charset_UnsupportedCharsetException__
+
+#pragma interface
+
+#include <java/lang/IllegalArgumentException.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+      namespace charset
+      {
+          class UnsupportedCharsetException;
+      }
+    }
+  }
+}
+
+class java::nio::charset::UnsupportedCharsetException : public ::java::lang::IllegalArgumentException
+{
+
+public:
+  UnsupportedCharsetException(::java::lang::String *);
+  virtual ::java::lang::String * getCharsetName();
+private:
+  static const jlong serialVersionUID = 1490765524727386367LL;
+public: // actually package-private
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::IllegalArgumentException)))) charsetName;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_nio_charset_UnsupportedCharsetException__
diff --git a/libjava/java/nio/charset/spi/CharsetProvider.h b/libjava/java/nio/charset/spi/CharsetProvider.h
new file mode 100644
index 00000000000..b194e106b4c
--- /dev/null
+++ b/libjava/java/nio/charset/spi/CharsetProvider.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_nio_charset_spi_CharsetProvider__
+#define __java_nio_charset_spi_CharsetProvider__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+      namespace charset
+      {
+          class Charset;
+        namespace spi
+        {
+            class CharsetProvider;
+        }
+      }
+    }
+  }
+}
+
+class java::nio::charset::spi::CharsetProvider : public ::java::lang::Object
+{
+
+public: // actually protected
+  CharsetProvider();
+public:
+  virtual ::java::util::Iterator * charsets() = 0;
+  virtual ::java::nio::charset::Charset * charsetForName(::java::lang::String *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_nio_charset_spi_CharsetProvider__