libjava/ 2012-12-03 Matthias Klose 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. libjava/classpath/ 2012-12-03 Matthias Klose * configure.ac (AM_INIT_AUTOMAKE): Call with no-dist. * m4/lib-ld.m4, m4/lib-link.m4,m4/lib-prefix.m4: New. Index: gnu/java/nio/FileLockImpl.java =================================================================== --- gnu/java/nio/FileLockImpl.java (Revision 194074) +++ gnu/java/nio/FileLockImpl.java (Arbeitskopie) @@ -90,6 +90,11 @@ return valid; } + public void close() throws Exception + { + release(); + } + /** * Releases the lock if it is still valid. Marks this lock as invalid. */ Index: sources.am =================================================================== --- sources.am (Revision 194074) +++ sources.am (Arbeitskopie) @@ -4625,6 +4625,7 @@ classpath/java/lang/ArrayIndexOutOfBoundsException.java \ classpath/java/lang/ArrayStoreException.java \ classpath/java/lang/AssertionError.java \ +classpath/java/lang/AutoCloseable.java \ classpath/java/lang/Boolean.java \ classpath/java/lang/Byte.java \ classpath/java/lang/CharSequence.java \ @@ -4683,6 +4684,7 @@ classpath/java/lang/Process.java \ classpath/java/lang/ProcessBuilder.java \ classpath/java/lang/Readable.java \ +classpath/java/lang/ReflectiveOperationException.java \ classpath/java/lang/Runnable.java \ java/lang/Runtime.java \ classpath/java/lang/RuntimeException.java \ Index: gcj/javaprims.h =================================================================== --- gcj/javaprims.h (Revision 194074) +++ gcj/javaprims.h (Arbeitskopie) @@ -161,6 +161,7 @@ class ArrayIndexOutOfBoundsException; class ArrayStoreException; class AssertionError; + class AutoCloseable; class Boolean; class Byte; class CharSequence; @@ -226,6 +227,7 @@ class Process; class ProcessBuilder; class Readable; + class ReflectiveOperationException; class Runnable; class Runtime; class RuntimeException; Index: classpath/configure.ac =================================================================== --- classpath/configure.ac (Revision 194074) +++ classpath/configure.ac (Arbeitskopie) @@ -75,7 +75,7 @@ AC_SUBST(CLASSPATH_CONVENIENCE) AC_PREREQ(2.64) -AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar -Wno-portability]) +AM_INIT_AUTOMAKE([1.9.0 no-dist gnu std-options tar-ustar -Wno-portability]) AC_CONFIG_HEADERS([include/config.h]) AC_PREFIX_DEFAULT(/usr/local/classpath)