2012-12-19 Matthias Klose <doko@ubuntu.com>

        Import GNU Classpath (20121202).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * sources.am, gcj/javaprims.h: Regenerate.
        * gnu/java/nio/FileLockImpl.java (close): New override.


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

15 files changed, 65 insertions, 14 deletions

diff --git a/libjava/java/lang/AssertionError.h b/libjava/java/lang/AssertionError.h
index 0154c04b3f4..15c4672e75c 100644
--- a/libjava/java/lang/AssertionError.h
+++ b/libjava/java/lang/AssertionError.h
@@ -20,6 +20,7 @@ public:
   AssertionError(jlong);
   AssertionError(jfloat);
   AssertionError(jdouble);
+  AssertionError(::java::lang::String *, ::java::lang::Throwable *);
 private:
   static const jlong serialVersionUID = -5013299493970297370LL;
 public:
diff --git a/libjava/java/lang/AutoCloseable.h b/libjava/java/lang/AutoCloseable.h
new file mode 100644
index 00000000000..023538f1f2d
--- /dev/null
+++ b/libjava/java/lang/AutoCloseable.h
@@ -0,0 +1,19 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_lang_AutoCloseable__
+#define __java_lang_AutoCloseable__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+
+class java::lang::AutoCloseable : public ::java::lang::Object
+{
+
+public:
+  virtual void close() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __java_lang_AutoCloseable__
diff --git a/libjava/java/lang/Boolean.h b/libjava/java/lang/Boolean.h
index 0ead5b527e4..8a764b9b688 100644
--- a/libjava/java/lang/Boolean.h
+++ b/libjava/java/lang/Boolean.h
@@ -23,6 +23,7 @@ public:
   jboolean equals(::java::lang::Object *);
   static jboolean getBoolean(::java::lang::String *);
   jint Boolean$compareTo(::java::lang::Boolean *);
+  static jint compare(jboolean, jboolean);
   static jboolean parseBoolean(::java::lang::String *);
   jint compareTo(::java::lang::Object *);
 private:
diff --git a/libjava/java/lang/Byte.h b/libjava/java/lang/Byte.h
index fc9e3b33f67..547e08f5113 100644
--- a/libjava/java/lang/Byte.h
+++ b/libjava/java/lang/Byte.h
@@ -33,6 +33,7 @@ public:
   jint hashCode();
   jboolean equals(::java::lang::Object *);
   jint Byte$compareTo(::java::lang::Byte *);
+  static jint compare(jbyte, jbyte);
   jint compareTo(::java::lang::Object *);
 private:
   static const jlong serialVersionUID = -7183698231559129828LL;
diff --git a/libjava/java/lang/ClassNotFoundException.h b/libjava/java/lang/ClassNotFoundException.h
index c0ab7815807..365f5a866d4 100644
--- a/libjava/java/lang/ClassNotFoundException.h
+++ b/libjava/java/lang/ClassNotFoundException.h
@@ -6,9 +6,9 @@
 
 #pragma interface
 
-#include <java/lang/Exception.h>
+#include <java/lang/ReflectiveOperationException.h>
 
-class java::lang::ClassNotFoundException : public ::java::lang::Exception
+class java::lang::ClassNotFoundException : public ::java::lang::ReflectiveOperationException
 {
 
 public:
@@ -19,7 +19,7 @@ public:
   virtual ::java::lang::Throwable * getCause();
 private:
   static const jlong serialVersionUID = 9176873029745254542LL;
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) ex;
+  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::lang::ReflectiveOperationException)))) ex;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/java/lang/IllegalAccessException.h b/libjava/java/lang/IllegalAccessException.h
index c0917475699..a01967bfe63 100644
--- a/libjava/java/lang/IllegalAccessException.h
+++ b/libjava/java/lang/IllegalAccessException.h
@@ -6,9 +6,9 @@
 
 #pragma interface
 
-#include <java/lang/Exception.h>
+#include <java/lang/ReflectiveOperationException.h>
 
-class java::lang::IllegalAccessException : public ::java::lang::Exception
+class java::lang::IllegalAccessException : public ::java::lang::ReflectiveOperationException
 {
 
 public:
diff --git a/libjava/java/lang/InstantiationException.h b/libjava/java/lang/InstantiationException.h
index 805ab3c70dc..72df77f9fed 100644
--- a/libjava/java/lang/InstantiationException.h
+++ b/libjava/java/lang/InstantiationException.h
@@ -6,9 +6,9 @@
 
 #pragma interface
 
-#include <java/lang/Exception.h>
+#include <java/lang/ReflectiveOperationException.h>
 
-class java::lang::InstantiationException : public ::java::lang::Exception
+class java::lang::InstantiationException : public ::java::lang::ReflectiveOperationException
 {
 
 public:
diff --git a/libjava/java/lang/Integer.h b/libjava/java/lang/Integer.h
index f1bd11bdbd9..95624e432c3 100644
--- a/libjava/java/lang/Integer.h
+++ b/libjava/java/lang/Integer.h
@@ -43,6 +43,7 @@ public:
   static ::java::lang::Integer * getInteger(::java::lang::String *, ::java::lang::Integer *);
   static ::java::lang::Integer * decode(::java::lang::String *);
   jint Integer$compareTo(::java::lang::Integer *);
+  static jint compare(jint, jint);
   static jint bitCount(jint);
   static jint rotateLeft(jint, jint);
   static jint rotateRight(jint, jint);
diff --git a/libjava/java/lang/LinkageError.h b/libjava/java/lang/LinkageError.h
index 4368d8b9ff8..ed632b35c07 100644
--- a/libjava/java/lang/LinkageError.h
+++ b/libjava/java/lang/LinkageError.h
@@ -14,6 +14,7 @@ class java::lang::LinkageError : public ::java::lang::Error
 public:
   LinkageError();
   LinkageError(::java::lang::String *);
+  LinkageError(::java::lang::String *, ::java::lang::Throwable *);
 private:
   static const jlong serialVersionUID = 3579600108157160122LL;
 public:
diff --git a/libjava/java/lang/Long.h b/libjava/java/lang/Long.h
index 60c0d24379d..ae5c2640c86 100644
--- a/libjava/java/lang/Long.h
+++ b/libjava/java/lang/Long.h
@@ -43,6 +43,7 @@ public:
   static ::java::lang::Long * getLong(::java::lang::String *, jlong);
   static ::java::lang::Long * getLong(::java::lang::String *, ::java::lang::Long *);
   jint Long$compareTo(::java::lang::Long *);
+  static jint compare(jlong, jlong);
   static jint bitCount(jlong);
   static jlong rotateLeft(jlong, jint);
   static jlong rotateRight(jlong, jint);
diff --git a/libjava/java/lang/NoSuchFieldException.h b/libjava/java/lang/NoSuchFieldException.h
index 36fe841ed74..11e1d1aceb3 100644
--- a/libjava/java/lang/NoSuchFieldException.h
+++ b/libjava/java/lang/NoSuchFieldException.h
@@ -6,9 +6,9 @@
 
 #pragma interface
 
-#include <java/lang/Exception.h>
+#include <java/lang/ReflectiveOperationException.h>
 
-class java::lang::NoSuchFieldException : public ::java::lang::Exception
+class java::lang::NoSuchFieldException : public ::java::lang::ReflectiveOperationException
 {
 
 public:
diff --git a/libjava/java/lang/NoSuchMethodException.h b/libjava/java/lang/NoSuchMethodException.h
index dc905d67f48..d2de014c5b9 100644
--- a/libjava/java/lang/NoSuchMethodException.h
+++ b/libjava/java/lang/NoSuchMethodException.h
@@ -6,9 +6,9 @@
 
 #pragma interface
 
-#include <java/lang/Exception.h>
+#include <java/lang/ReflectiveOperationException.h>
 
-class java::lang::NoSuchMethodException : public ::java::lang::Exception
+class java::lang::NoSuchMethodException : public ::java::lang::ReflectiveOperationException
 {
 
 public:
diff --git a/libjava/java/lang/ReflectiveOperationException.h b/libjava/java/lang/ReflectiveOperationException.h
new file mode 100644
index 00000000000..3a6a698214a
--- /dev/null
+++ b/libjava/java/lang/ReflectiveOperationException.h
@@ -0,0 +1,25 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_lang_ReflectiveOperationException__
+#define __java_lang_ReflectiveOperationException__
+
+#pragma interface
+
+#include <java/lang/Exception.h>
+
+class java::lang::ReflectiveOperationException : public ::java::lang::Exception
+{
+
+public:
+  ReflectiveOperationException();
+  ReflectiveOperationException(::java::lang::String *);
+  ReflectiveOperationException(::java::lang::String *, ::java::lang::Throwable *);
+  ReflectiveOperationException(::java::lang::Throwable *);
+private:
+  static const jlong serialVersionUID = 123456789LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_lang_ReflectiveOperationException__
diff --git a/libjava/java/lang/Short.h b/libjava/java/lang/Short.h
index 4858db52f4a..48a3973690c 100644
--- a/libjava/java/lang/Short.h
+++ b/libjava/java/lang/Short.h
@@ -33,6 +33,7 @@ public:
   jint hashCode();
   jboolean equals(::java::lang::Object *);
   jint Short$compareTo(::java::lang::Short *);
+  static jint compare(jshort, jshort);
   static jshort reverseBytes(jshort);
   jint compareTo(::java::lang::Object *);
 private:
diff --git a/libjava/java/lang/reflect/InvocationTargetException.h b/libjava/java/lang/reflect/InvocationTargetException.h
index 37e229c2957..5132c76fac2 100644
--- a/libjava/java/lang/reflect/InvocationTargetException.h
+++ b/libjava/java/lang/reflect/InvocationTargetException.h
@@ -6,9 +6,9 @@
 
 #pragma interface
 
-#include <java/lang/Exception.h>
+#include <java/lang/ReflectiveOperationException.h>
 
-class java::lang::reflect::InvocationTargetException : public ::java::lang::Exception
+class java::lang::reflect::InvocationTargetException : public ::java::lang::ReflectiveOperationException
 {
 
 public: // actually protected
@@ -20,7 +20,7 @@ public:
   virtual ::java::lang::Throwable * getCause();
 private:
   static const jlong serialVersionUID = 4085088731926701167LL;
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) target;
+  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::lang::ReflectiveOperationException)))) target;
 public:
   static ::java::lang::Class class$;
 };