[patch] classpath merge 20121202

public inbox for java-patches@gcc.gnu.org
 help / color / mirror / Atom feed

* [patch] classpath merge 20121202
@ 2012-12-03 11:04 Matthias Klose
  2012-12-03 14:33 ` Andrew Hughes
  2012-12-11 17:23 ` Andrew Haley
  0 siblings, 2 replies; 5+ messages in thread
From: Matthias Klose @ 2012-12-03 11:04 UTC (permalink / raw)
  To: GCJ-patches

[-- Attachment #1: Type: text/plain, Size: 542 bytes --]

Prepared a classpath merge from classpath 20121202.

 - branches/CLASSPATH was updated to:

   - import classpath from git://git.savannah.gnu.org/classpath.git
     commit c814d82e5a435f93150cd28b7cf0f9d600ff400d
   - add m4/lib-{ld,link,prefix}.m4

   The additional m4 files were taken from the gettext sources,
   necessary to regenerate the auto* files.

The merge itself didn't show up any issues. The testsuite doesn't show any
regressions. Not attaching a diff of the regenerated header and class files.
Ok for the trunk?

  Matthias


[-- Attachment #2: cp.diff --]
[-- Type: text/x-diff, Size: 2769 bytes --]

libjava/

2012-12-03  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.

libjava/classpath/

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

        * 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)
 


[-- Attachment #3: svn-status --]
[-- Type: text/plain, Size: 27015 bytes --]

M       sources.am
M       gcj/javaprims.h
 M      classpath
M       classpath/external/Makefile.in
M       classpath/external/sax/org/xml/sax/ext/Locator2Impl.java
M       classpath/external/sax/org/xml/sax/ext/EntityResolver2.java
M       classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java
M       classpath/external/sax/Makefile.in
M       classpath/external/jsr166/Makefile.in
M       classpath/external/w3c_dom/Makefile.in
M       classpath/external/relaxngDatatype/Makefile.in
M       classpath/m4/acinclude.m4
A  +    classpath/m4/lib-link.m4
A  +    classpath/m4/lib-prefix.m4
A  +    classpath/m4/lib-ld.m4
M       classpath/m4/ac_prog_javac.m4
M       classpath/configure
M       classpath/native/Makefile.in
M       classpath/native/jawt/Makefile.in
M       classpath/native/fdlibm/Makefile.in
M       classpath/native/plugin/Makefile.in
M       classpath/native/jni/java-lang/Makefile.in
M       classpath/native/jni/midi-alsa/Makefile.in
M       classpath/native/jni/java-nio/Makefile.in
M       classpath/native/jni/java-net/Makefile.in
M       classpath/native/jni/gstreamer-peer/Makefile.in
M       classpath/native/jni/Makefile.in
M       classpath/native/jni/java-io/java_io_VMConsole.c
M       classpath/native/jni/java-io/Makefile.in
M       classpath/native/jni/native-lib/Makefile.in
M       classpath/native/jni/java-util/java_util_VMTimeZone.c
M       classpath/native/jni/java-util/Makefile.in
M       classpath/native/jni/java-math/Makefile.in
M       classpath/native/jni/xmlj/Makefile.in
M       classpath/native/jni/qt-peer/Makefile.in
M       classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
M       classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
M       classpath/native/jni/gtk-peer/Makefile.in
M       classpath/native/jni/midi-dssi/Makefile.in
M       classpath/native/jni/midi-dssi/gnu_javax_sound_midi_dssi_DSSISynthesizer.c
M       classpath/native/jni/classpath/Makefile.in
M       classpath/native/jni/gconf-peer/Makefile.in
M       classpath/gnu/java/text/StringFormatBuffer.java
M       classpath/gnu/java/text/AttributedFormatBuffer.java
M       classpath/gnu/java/text/FormatCharacterIterator.java
M       classpath/gnu/java/text/FormatBuffer.java
M       classpath/gnu/java/nio/FileLockImpl.java
M       classpath/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java
M       classpath/gnu/javax/sound/sampled/WAV/WAVReader.java
M       classpath/gnu/javax/sound/midi/file/MidiFileWriter.java
M       classpath/gnu/javax/sound/midi/file/MidiFileReader.java
M       classpath/gnu/javax/sound/midi/dssi/DSSISynthesizer.java
M       classpath/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java
M       classpath/gnu/xml/transform/SAXSerializer.java
M       classpath/java/io/ObjectOutput.java
M       classpath/java/io/Closeable.java
M       classpath/java/io/ObjectInputStream.java
M       classpath/java/io/ObjectInput.java
M       classpath/java/util/Collections.java
M       classpath/java/util/Formatter.java
M       classpath/java/util/regex/Matcher.java
M       classpath/java/util/TimeZone.java
M       classpath/java/lang/Character.java
M       classpath/java/lang/NoSuchMethodException.java
M       classpath/java/lang/Short.java
M       classpath/java/lang/InstantiationException.java
M       classpath/java/lang/AssertionError.java
M       classpath/java/lang/Boolean.java
A  +    classpath/java/lang/AutoCloseable.java
A  +    classpath/java/lang/ReflectiveOperationException.java
M       classpath/java/lang/String.java
M       classpath/java/lang/IllegalAccessException.java
M       classpath/java/lang/LinkageError.java
M       classpath/java/lang/reflect/Member.java
M       classpath/java/lang/reflect/Modifier.java
M       classpath/java/lang/reflect/InvocationTargetException.java
M       classpath/java/lang/NoSuchFieldException.java
M       classpath/java/lang/Integer.java
M       classpath/java/lang/ClassNotFoundException.java
M       classpath/java/lang/System.java
M       classpath/java/lang/Long.java
M       classpath/java/lang/Byte.java
M       classpath/java/text/MessageFormat.java
M       classpath/java/text/AttributedString.java
M       classpath/java/text/BreakIterator.java
M       classpath/java/text/DateFormatSymbols.java
M       classpath/java/text/AttributedStringIterator.java
M       classpath/java/text/CollationElementIterator.java
M       classpath/java/text/NumberFormat.java
M       classpath/java/text/ChoiceFormat.java
M       classpath/java/text/DecimalFormat.java
M       classpath/java/text/Bidi.java
M       classpath/java/nio/channels/FileLock.java
M       classpath/java/beans/XMLEncoder.java
M       classpath/java/beans/XMLDecoder.java
M       classpath/java/awt/geom/Area.java
M       classpath/java/sql/ResultSet.java
M       classpath/java/sql/Statement.java
M       classpath/java/sql/Connection.java
M       classpath/ChangeLog.gcj
M       classpath/missing
M       classpath/aclocal.m4
M       classpath/examples/Makefile.in
M       classpath/install-sh
M       classpath/scripts/classpath.spec.in
M       classpath/scripts/Makefile.in
M       classpath/tools/com/sun/javadoc/Doc.java
M       classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler.class
M       classpath/tools/classes/gnu/classpath/tools/rmic/Main.class
M       classpath/tools/classes/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.class
M       classpath/tools/classes/gnu/classpath/tools/rmic/Variables.class
M       classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler$MethodRef.class
M       classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionTag.class
D       classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionTaglet.class
M       classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$UsageType.class
M       classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$TreeNode.class
M       classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.class
M       classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$1.class
M       classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$2.class
M       classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$3.class
M       classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet.class
M       classpath/tools/classes/gnu/classpath/tools/doclets/PackageMatcher.class
D       classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionTagletPath.class
M       classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$InterfaceRelation.class
M       classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$DocletOptionGroup.class
M       classpath/tools/classes/gnu/classpath/tools/doclets/AbstractDoclet$IndexKey.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Whitespace.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Parser.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$3.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/MemberDocImpl.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$7.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$OptionProcessor.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/RootDocImpl.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/BlockSourceComponent.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/EmptyStatementComponent.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/Type.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/Evaluator.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassDocImpl.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/StaticBlockComponent.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$10.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/ImportComponent.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$18.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/BracketClose.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/FieldComponent.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$2.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$6.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Parser$1.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/FieldDocImpl.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassDocProxy.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/SourceComponent.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$1.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$5.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$9.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/DocImpl.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassComponent.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Parser$Context.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/CommentComponent.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$12.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/SlashSlashCommentComponent.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$4.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/PackageComponent.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$8.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$21.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/IgnoredFileParseException.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/PackageDocImpl.class
M       classpath/tools/classes/gnu/classpath/tools/gjdoc/FunctionComponent.class
M       classpath/tools/classes/com/sun/javadoc/Doc.class
M       classpath/tools/Makefile.in
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/dbcentx.mod
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-box.ent
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-num.ent
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr1.ent
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr2.ent
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsa.ent
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsb.ent
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsc.ent
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-dia.ent
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsn.ent
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amso.ent
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat1.ent
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsr.ent
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat2.ent
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk1.ent
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk2.ent
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk3.ent
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk4.ent
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-tech.ent
M       classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-pub.ent
M       classpath/tools/gnu/classpath/tools/gjdoc/expr/Evaluator.java
M       classpath/tools/gnu/classpath/tools/gjdoc/expr/Type.java
M       classpath/tools/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java
M       classpath/tools/gnu/classpath/tools/gjdoc/MemberDocImpl.java
M       classpath/tools/gnu/classpath/tools/gjdoc/Main.java
M       classpath/tools/gnu/classpath/tools/gjdoc/DocImpl.java
M       classpath/tools/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java
M       classpath/tools/gnu/classpath/tools/gjdoc/RootDocImpl.java
M       classpath/tools/gnu/classpath/tools/gjdoc/ClassDocProxy.java
M       classpath/tools/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java
M       classpath/tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java
M       classpath/tools/gnu/classpath/tools/gjdoc/Parser.java
M       classpath/tools/gnu/classpath/tools/gjdoc/PackageDocImpl.java
M       classpath/tools/gnu/classpath/tools/gjdoc/ClassDocImpl.java
M       classpath/tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java
M       classpath/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java
M       classpath/tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java
M       classpath/tools/gnu/classpath/tools/rmic/Variables.java
M       classpath/tools/gnu/classpath/tools/rmic/Main.java
M       classpath/tools/gnu/classpath/tools/doclets/PackageMatcher.java
M       classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
M       classpath/tools/gnu/classpath/tools/doclets/AbstractDoclet.java
M       classpath/doc/Makefile.am
M       classpath/doc/api/Makefile.in
M       classpath/doc/texinfo.tex
M       classpath/doc/cp-tools.texinfo
M       classpath/doc/Makefile.in
M       classpath/javax/management/remote/rmi/RMIConnection.java
M       classpath/javax/management/MBeanConstructorInfo.java
M       classpath/javax/management/DefaultLoaderRepository.java
M       classpath/javax/xml/xpath/XPathFunction.java
M       classpath/javax/xml/stream/events/StartElement.java
M       classpath/javax/xml/stream/events/DTD.java
M       classpath/javax/xml/stream/events/EndElement.java
M       classpath/javax/xml/stream/XMLEventReader.java
M       classpath/javax/xml/stream/XMLEventFactory.java
M       classpath/javax/xml/namespace/NamespaceContext.java
M       classpath/javax/swing/tree/TreeNode.java
M       classpath/javax/swing/tree/DefaultMutableTreeNode.java
M       classpath/javax/sound/midi/MidiSystem.java
M       classpath/javax/sound/midi/SoundbankResource.java
M       classpath/javax/sound/midi/MetaMessage.java
M       classpath/javax/sound/midi/MidiDevice.java
M       classpath/javax/sound/midi/Track.java
M       classpath/javax/sound/midi/Receiver.java
M       classpath/javax/sound/midi/Transmitter.java
M       classpath/javax/sound/sampled/Line.java
M       classpath/javax/sound/sampled/AudioSystem.java
M       classpath/javax/activation/MimeTypeParameterList.java
M       classpath/javax/activation/ActivationDataFlavor.java
M       classpath/javax/security/sasl/Sasl.java
M       classpath/NEWS
M       classpath/include/Makefile.in
M       classpath/ChangeLog
M       classpath/org/omg/DynamicAny/_DynUnionStub.java
M       classpath/org/omg/DynamicAny/_DynSequenceStub.java
M       classpath/org/omg/DynamicAny/_DynValueStub.java
M       classpath/org/omg/DynamicAny/_DynAnyFactoryStub.java
M       classpath/org/omg/DynamicAny/_DynAnyStub.java
M       classpath/org/omg/DynamicAny/_DynEnumStub.java
M       classpath/org/omg/DynamicAny/_DynArrayStub.java
M       classpath/org/omg/DynamicAny/_DynStructStub.java
M       classpath/org/omg/DynamicAny/_DynFixedStub.java
M       classpath/org/omg/PortableServer/_ServantActivatorStub.java
M       classpath/org/omg/PortableServer/_ServantLocatorStub.java
M       classpath/org/omg/CORBA/LocalObject.java
M       classpath/org/omg/CORBA/portable/Delegate.java
M       classpath/org/omg/CORBA/portable/ObjectImpl.java
M       classpath/org/omg/CORBA/portable/InputStream.java
M       classpath/org/omg/CORBA_2_3/portable/InputStream.java
M       classpath/org/omg/CORBA_2_3/portable/OutputStream.java
M       classpath/config.sub
M       classpath/THANKYOU
M       classpath/INSTALL
M       classpath/lib/gnu/xml/transform/SAXSerializer.class
M       classpath/lib/gnu/java/text/FormatBuffer.class
M       classpath/lib/gnu/java/text/StringFormatBuffer.class
M       classpath/lib/gnu/java/text/AttributedFormatBuffer.class
M       classpath/lib/gnu/java/text/FormatCharacterIterator.class
M       classpath/lib/gnu/java/nio/FileLockImpl.class
M       classpath/lib/gnu/java/beans/editors/ColorEditor.class
M       classpath/lib/gnu/java/locale/LocaleData.class
M       classpath/lib/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$DSSIInfo.class
M       classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSISoundbank.class
M       classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer.class
M       classpath/lib/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$1.class
M       classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIReceiver.class
M       classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIMidiChannel.class
M       classpath/lib/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.class
M       classpath/lib/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.class
M       classpath/lib/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.class
M       classpath/lib/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.class
M       classpath/lib/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.class
M       classpath/lib/javax/sound/midi/MidiDevice$Info.class
M       classpath/lib/javax/sound/midi/MidiSystem.class
M       classpath/lib/javax/sound/midi/MidiDevice.class
M       classpath/lib/javax/sound/midi/Track.class
M       classpath/lib/javax/sound/midi/Receiver.class
M       classpath/lib/javax/sound/midi/Transmitter.class
M       classpath/lib/javax/sound/midi/MetaMessage.class
M       classpath/lib/javax/sound/midi/SoundbankResource.class
M       classpath/lib/javax/sound/sampled/Line.class
M       classpath/lib/javax/sound/sampled/AudioSystem.class
M       classpath/lib/javax/sound/sampled/Line$Info.class
M       classpath/lib/javax/security/sasl/Sasl.class
M       classpath/lib/java/beans/XMLDecoder.class
M       classpath/lib/java/beans/XMLEncoder.class
M       classpath/lib/java/awt/geom/Area$CubicSegment.class
M       classpath/lib/java/awt/geom/Area$AreaIterator$IteratorSegment.class
M       classpath/lib/java/awt/geom/Area$Segment.class
M       classpath/lib/java/awt/geom/Area$LineSegment.class
M       classpath/lib/java/awt/geom/Area.class
M       classpath/lib/java/awt/geom/Area$AreaIterator.class
M       classpath/lib/java/awt/geom/Area$Intersection.class
M       classpath/lib/java/awt/geom/Area$QuadSegment.class
M       classpath/lib/java/sql/ResultSet.class
M       classpath/lib/java/sql/Connection.class
M       classpath/lib/java/sql/Statement.class
M       classpath/lib/java/io/Closeable.class
M       classpath/lib/java/io/ObjectInputStream.class
M       classpath/lib/java/io/ObjectInputStream$GetField.class
M       classpath/lib/java/io/ObjectOutput.class
M       classpath/lib/java/io/ObjectInputStream$2.class
M       classpath/lib/java/io/ObjectInput.class
M       classpath/lib/java/io/ObjectInputStream$1.class
M       classpath/lib/java/io/ObjectInputStream$ValidatorAndPriority.class
M       classpath/lib/java/util/Collections$EmptyList.class
M       classpath/lib/java/util/Collections$LIFOQueue.class
M       classpath/lib/java/util/Collections$3.class
M       classpath/lib/java/util/Collections$1$SynchronizedMapEntry.class
M       classpath/lib/java/util/Collections$SynchronizedIterator.class
M       classpath/lib/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.class
M       classpath/lib/java/util/Collections$UnmodifiableSortedSet.class
M       classpath/lib/java/util/Collections$SynchronizedCollection.class
M       classpath/lib/java/util/Collections$6.class
M       classpath/lib/java/util/Collections$CheckedMap.class
M       classpath/lib/java/util/Collections$MapSet.class
M       classpath/lib/java/util/Collections$EmptyMap.class
M       classpath/lib/java/util/Collections$SynchronizedSortedMap.class
M       classpath/lib/java/util/Collections$1.class
M       classpath/lib/java/util/Collections$9.class
M       classpath/lib/java/util/Collections$CopiesList.class
M       classpath/lib/java/util/Collections$UnmodifiableList.class
M       classpath/lib/java/util/Collections$SynchronizedRandomAccessList.class
M       classpath/lib/java/util/Collections$4.class
M       classpath/lib/java/util/Collections$UnmodifiableListIterator.class
M       classpath/lib/java/util/Collections$SynchronizedList.class
M       classpath/lib/java/util/Collections$CheckedSet.class
M       classpath/lib/java/util/Collections$CheckedSortedMap.class
M       classpath/lib/java/util/Collections$EmptySet.class
M       classpath/lib/java/util/Collections.class
M       classpath/lib/java/util/Collections$SynchronizedSortedSet.class
M       classpath/lib/java/util/Collections$CheckedList.class
M       classpath/lib/java/util/Collections$CheckedListIterator.class
M       classpath/lib/java/util/Collections$CheckedMap$CheckedEntrySet.class
M       classpath/lib/java/util/Collections$7.class
M       classpath/lib/java/util/Collections$SynchronizedMap.class
M       classpath/lib/java/util/Collections$UnmodifiableMap.class
M       classpath/lib/java/util/Collections$SingletonMap.class
M       classpath/lib/java/util/Collections$UnmodifiableRandomAccessList.class
M       classpath/lib/java/util/TimeZone.class
M       classpath/lib/java/util/Collections$SingletonList.class
M       classpath/lib/java/util/Collections$2.class
M       classpath/lib/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet$UnmodifiableMapEntry.class
M       classpath/lib/java/util/Formatter.class
M       classpath/lib/java/util/Collections$CheckedRandomAccessList.class
M       classpath/lib/java/util/Collections$UnmodifiableCollection.class
M       classpath/lib/java/util/Collections$CheckedSortedSet.class
M       classpath/lib/java/util/Collections$ReverseComparator.class
M       classpath/lib/java/util/Collections$5.class
M       classpath/lib/java/util/Collections$UnmodifiableIterator.class
M       classpath/lib/java/util/Collections$SynchronizedSet.class
M       classpath/lib/java/util/Collections$CheckedCollection.class
M       classpath/lib/java/util/Collections$UnmodifiableSet.class
M       classpath/lib/java/util/Collections$UnmodifiableSortedMap.class
M       classpath/lib/java/util/Collections$SingletonSet.class
M       classpath/lib/java/util/Collections$CheckedIterator.class
M       classpath/lib/java/util/regex/Matcher.class
M       classpath/lib/java/util/Collections$8.class
M       classpath/lib/java/util/TimeZone$1.class
M       classpath/lib/java/util/Collections$SynchronizedListIterator.class
M       classpath/lib/java/lang/Boolean.class
M       classpath/lib/java/lang/reflect/Member.class
M       classpath/lib/java/lang/reflect/InvocationTargetException.class
M       classpath/lib/java/lang/Integer.class
M       classpath/lib/java/lang/Byte.class
A       classpath/lib/java/lang/AutoCloseable.class
A       classpath/lib/java/lang/ReflectiveOperationException.class
M       classpath/lib/java/lang/NoSuchMethodException.class
M       classpath/lib/java/lang/AssertionError.class
M       classpath/lib/java/lang/Short.class
M       classpath/lib/java/lang/Long.class
M       classpath/lib/java/lang/InstantiationException.class
M       classpath/lib/java/lang/NoSuchFieldException.class
M       classpath/lib/java/lang/IllegalAccessException.class
M       classpath/lib/java/lang/LinkageError.class
M       classpath/lib/java/lang/ClassNotFoundException.class
A       classpath/lib/java/text/DateFormatSymbols$DFSData.class
M       classpath/lib/java/text/SimpleDateFormat.class
M       classpath/lib/java/text/ChoiceFormat.class
M       classpath/lib/java/text/Bidi.class
M       classpath/lib/java/text/CollationElementIterator.class
M       classpath/lib/java/text/Format.class
M       classpath/lib/java/text/BreakIterator.class
M       classpath/lib/java/text/AttributedString$AttributeRange.class
M       classpath/lib/java/text/MessageFormat.class
M       classpath/lib/java/text/AttributedString.class
M       classpath/lib/java/text/DateFormatSymbols.class
M       classpath/lib/java/text/NumberFormat.class
M       classpath/lib/java/text/AttributedStringIterator.class
M       classpath/lib/java/text/MessageFormat$Field.class
M       classpath/lib/java/text/DecimalFormat.class
M       classpath/lib/java/text/NumberFormat$Field.class
M       classpath/lib/java/nio/channels/FileLock.class
M       classpath/lib/Makefile.in
M       classpath/Makefile.in
M       classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties
M       classpath/resource/Makefile.in
M       classpath/depcomp
M       classpath/configure.ac
M       ChangeLog
M       java/util/regex/Matcher.h
M       java/util/TimeZone$1.h
M       java/lang/Boolean.h
M       java/lang/Long.h
M       java/lang/NoSuchMethodException.h
M       java/lang/AssertionError.h
A       java/lang/ReflectiveOperationException.h
M       java/lang/InstantiationException.h
M       java/lang/Byte.h
M       java/lang/ClassNotFoundException.h
M       java/lang/NoSuchFieldException.h
M       java/lang/LinkageError.h
M       java/lang/Integer.h
M       java/lang/reflect/InvocationTargetException.h
M       java/lang/IllegalAccessException.h
M       java/lang/Short.h
A       java/lang/AutoCloseable.h
A       java/text/DateFormatSymbols$DFSData.h
M       java/text/CollationElementIterator.h
M       java/text/DateFormatSymbols.h
M       java/nio/channels/FileLock.h
M       java/awt/geom/Area.h
M       gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$DSSIInfo.h
M       gnu/java/text/StringFormatBuffer.h
M       gnu/java/text/AttributedFormatBuffer.h
M       gnu/java/text/FormatCharacterIterator.h
M       gnu/java/text/FormatBuffer.h
M       gnu/java/nio/FileLockImpl.java
M       gnu/java/nio/FileLockImpl.h
M       javax/security/sasl/Sasl.h

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [patch] classpath merge 20121202
  2012-12-03 11:04 [patch] classpath merge 20121202 Matthias Klose
@ 2012-12-03 14:33 ` Andrew Hughes
  2012-12-11 17:18   ` Matthias Klose
  2012-12-11 17:23 ` Andrew Haley
  1 sibling, 1 reply; 5+ messages in thread
From: Andrew Hughes @ 2012-12-03 14:33 UTC (permalink / raw)
  To: Matthias Klose; +Cc: GCJ-patches

----- Original Message -----
> Prepared a classpath merge from classpath 20121202.
> 
>  - branches/CLASSPATH was updated to:
> 
>    - import classpath from git://git.savannah.gnu.org/classpath.git
>      commit c814d82e5a435f93150cd28b7cf0f9d600ff400d
>    - add m4/lib-{ld,link,prefix}.m4
> 
>    The additional m4 files were taken from the gettext sources,
>    necessary to regenerate the auto* files.
> 
> The merge itself didn't show up any issues. The testsuite doesn't
> show any
> regressions. Not attaching a diff of the regenerated header and class
> files.
> Ok for the trunk?
> 

I already said here that I was working on this:

http://gcc.gnu.org/ml/java-patches/2012-q4/msg00028.html

Why have you suddenly come up with this completely out of the blue without any warning or discussion?

And where's the actual merge?  The attached diff has hardly anything in it.

>   Matthias
> 
> 

-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [patch] classpath merge 20121202
  2012-12-03 14:33 ` Andrew Hughes
@ 2012-12-11 17:18   ` Matthias Klose
  0 siblings, 0 replies; 5+ messages in thread
From: Matthias Klose @ 2012-12-11 17:18 UTC (permalink / raw)
  To: GCJ-patches

[-- Attachment #1: Type: text/plain, Size: 165 bytes --]

> And where's the actual merge?  The attached diff has hardly anything in it.

attached the complete diff, including all generated files (minus the .class files).



[-- Attachment #2: cp.diff.xz --]
[-- Type: application/x-xz, Size: 100792 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [patch] classpath merge 20121202
  2012-12-03 11:04 [patch] classpath merge 20121202 Matthias Klose
  2012-12-03 14:33 ` Andrew Hughes
@ 2012-12-11 17:23 ` Andrew Haley
  2012-12-19 17:14   ` Matthias Klose
  1 sibling, 1 reply; 5+ messages in thread
From: Andrew Haley @ 2012-12-11 17:23 UTC (permalink / raw)
  To: Matthias Klose; +Cc: GCJ-patches

On 12/03/2012 11:04 AM, Matthias Klose wrote:
> Prepared a classpath merge from classpath 20121202.
> 
>  - branches/CLASSPATH was updated to:
> 
>    - import classpath from git://git.savannah.gnu.org/classpath.git
>      commit c814d82e5a435f93150cd28b7cf0f9d600ff400d
>    - add m4/lib-{ld,link,prefix}.m4
> 
>    The additional m4 files were taken from the gettext sources,
>    necessary to regenerate the auto* files.
> 
> The merge itself didn't show up any issues. The testsuite doesn't show any
> regressions. Not attaching a diff of the regenerated header and class files.
> Ok for the trunk?

Yes.  Unless anyone has any specific objections, I don't propose to
review the Classpath changes themselves because they've already
been reviewed.

Thanks,
Andrew.


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [patch] classpath merge 20121202
  2012-12-11 17:23 ` Andrew Haley
@ 2012-12-19 17:14   ` Matthias Klose
  0 siblings, 0 replies; 5+ messages in thread
From: Matthias Klose @ 2012-12-19 17:14 UTC (permalink / raw)
  To: Andrew Haley; +Cc: GCJ-patches

Am 11.12.2012 18:22, schrieb Andrew Haley:
> On 12/03/2012 11:04 AM, Matthias Klose wrote:
>> Prepared a classpath merge from classpath 20121202.
>>
>>  - branches/CLASSPATH was updated to:
>>
>>    - import classpath from git://git.savannah.gnu.org/classpath.git
>>      commit c814d82e5a435f93150cd28b7cf0f9d600ff400d
>>    - add m4/lib-{ld,link,prefix}.m4
>>
>>    The additional m4 files were taken from the gettext sources,
>>    necessary to regenerate the auto* files.
>>
>> The merge itself didn't show up any issues. The testsuite doesn't show any
>> regressions. Not attaching a diff of the regenerated header and class files.
>> Ok for the trunk?
> 
> Yes.  Unless anyone has any specific objections, I don't propose to
> review the Classpath changes themselves because they've already
> been reviewed.

now committed, regenerated the header files with the gjavah from the merge.

  Matthias

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2012-12-19 17:14 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-12-03 11:04 [patch] classpath merge 20121202 Matthias Klose
2012-12-03 14:33 ` Andrew Hughes
2012-12-11 17:18   ` Matthias Klose
2012-12-11 17:23 ` Andrew Haley
2012-12-19 17:14   ` Matthias Klose

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).