obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

4 files changed, 542 insertions, 0 deletions

diff --git a/libjava/classpath/javax/sound/sampled/spi/AudioFileReader.java b/libjava/classpath/javax/sound/sampled/spi/AudioFileReader.java
new file mode 100644
index 000000000..098190f0f
--- /dev/null
+++ b/libjava/classpath/javax/sound/sampled/spi/AudioFileReader.java
@@ -0,0 +1,146 @@
+/* Audio file reader API
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.sound.sampled.spi;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+import javax.sound.sampled.AudioFileFormat;
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.UnsupportedAudioFileException;
+
+/**
+ * This abstract class defines the interface to audio file readers.
+ * A concrete provider subclass will implement the methods declared
+ * here.  These methods can be used to determine the format of
+ * files, and to retrieve an AudioInputStream for a file.
+ * @since 1.3
+ */
+public abstract class AudioFileReader
+{
+  /**
+   * The default constructor.  Note that this class is abstract and
+   * thus not directly instantiable.
+   */
+  public AudioFileReader()
+  {
+  }
+
+  /**
+   * Return the format of the given file as deduced by this provider.
+   * If the format of the file is not recognized, throws an exception.
+   * This will also throw an exception if there is an I/O error when
+   * reading the file.
+   * @param file the file to examine
+   * @return the audio file format
+   * @throws UnsupportedAudioFileException if the file's format is not
+   * recognized
+   * @throws IOException if there is an I/O error while reading the file
+   */
+  public abstract AudioFileFormat getAudioFileFormat(File file)
+    throws UnsupportedAudioFileException, IOException;
+
+  /**
+   * Return the format of the given input stream as deduced by this provider.
+   * If the format of the stream is not recognized, throws an exception.
+   * This will also throw an exception if there is an I/O error when
+   * reading the stream.  Note that providers typically use mark and reset
+   * on the stream when examining the data, and as a result an IOException
+   * may be thrown if the stream does not support these.
+   * @param is the stream to examine
+   * @return the audio file format
+   * @throws UnsupportedAudioFileException if the stream's format is not
+   * recognized
+   * @throws IOException if there is an I/O error while reading the stream
+   */
+  public abstract AudioFileFormat getAudioFileFormat(InputStream is)
+    throws UnsupportedAudioFileException, IOException;
+
+  /**
+   * Return the format of the given URL as deduced by this provider.
+   * If the format of the URL is not recognized, throws an exception.
+   * This will also throw an exception if there is an I/O error when
+   * reading the URL.
+   * @param url the URL to examine
+   * @return the audio file format
+   * @throws UnsupportedAudioFileException if the URL's format is not
+   * recognized
+   * @throws IOException if there is an I/O error while reading the URL
+   */
+  public abstract AudioFileFormat getAudioFileFormat(URL url)
+    throws UnsupportedAudioFileException, IOException;
+
+  /**
+   * Return an AudioInputStream for the given file.  The file is assumed
+   * to hold valid audio data.
+   * @param file the file to read
+   * @return an AudioInputStream for the file
+   * @throws UnsupportedAudioFileException if the file's type is not
+   * recognized
+   * @throws IOException if there is an error while reading the file
+   */
+  public abstract AudioInputStream getAudioInputStream(File file)
+    throws UnsupportedAudioFileException, IOException;
+
+  /**
+   * Return an AudioInputStream wrapping the given input stream.  The stream
+   * is assumed to hold valid audio data.
+   * @param is the input stream to wrap
+   * @return an AudioInputStream for the stream
+   * @throws UnsupportedAudioFileException if the stream's type is not
+   * recognized
+   * @throws IOException if there is an error while reading the stream
+   */
+  public abstract AudioInputStream getAudioInputStream(InputStream is)
+    throws UnsupportedAudioFileException, IOException;
+
+  /**
+   * Return an AudioInputStream for the given URL.  The URL is assumed
+   * to hold valid audio data.
+   * @param url the URL to read
+   * @return an AudioInputStream for the URL
+   * @throws UnsupportedAudioFileException if the URL's type is not
+   * recognized
+   * @throws IOException if there is an error while reading the URL
+   */
+  public abstract AudioInputStream getAudioInputStream(URL url)
+    throws UnsupportedAudioFileException, IOException;
+}
diff --git a/libjava/classpath/javax/sound/sampled/spi/AudioFileWriter.java b/libjava/classpath/javax/sound/sampled/spi/AudioFileWriter.java
new file mode 100644
index 000000000..82f9b31b8
--- /dev/null
+++ b/libjava/classpath/javax/sound/sampled/spi/AudioFileWriter.java
@@ -0,0 +1,131 @@
+/* Audio file writer API
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.sound.sampled.spi;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import javax.sound.sampled.AudioFileFormat;
+import javax.sound.sampled.AudioInputStream;
+
+/**
+ * This abstract class provides an API for writing audio files.  Concrete
+ * subclasses implement the methods declared here.
+ * @since 1.3
+ */
+public abstract class AudioFileWriter
+{
+  /**
+   * Creat a new audio file writer.
+   */
+  public AudioFileWriter()
+  {
+  }
+
+  /**
+   * Return an array of all audio file format types supported by this
+   * provider.
+   */
+  public abstract AudioFileFormat.Type[] getAudioFileTypes();
+
+  /**
+   * Return an array of all the audio file format types supported by this
+   * provider, which can be written given the input stream.
+   * @param ais the audio input stream
+   */
+  public abstract AudioFileFormat.Type[] getAudioFileTypes(AudioInputStream ais);
+
+  /**
+   * Return true if the indicated type is supported by this provider.
+   * @param type the audio file format type
+   */
+  public boolean isFileTypeSupported(AudioFileFormat.Type type)
+  {
+    AudioFileFormat.Type[] types = getAudioFileTypes();
+    for (int i = 0; i < types.length; ++i)
+      {
+        if (type.equals(types[i]))
+          return true;
+      }
+    return false;
+  }
+
+  /**
+   * Return true if the indicated type is supported by this provider,
+   * and can be written from the given audio input stream.
+   * @param type the audio file format type
+   * @param ais the audio input stream to write
+   */
+  public boolean isFileTypeSupported(AudioFileFormat.Type type,
+                                     AudioInputStream ais)
+  {
+    AudioFileFormat.Type[] types = getAudioFileTypes(ais);
+    for (int i = 0; i < types.length; ++i)
+      {
+        if (type.equals(types[i]))
+          return true;
+      }
+    return false;
+  }
+
+  /**
+   * Write audio data to a file.
+   * @param ais the audio input stream to write
+   * @param type the desired audio file format type
+   * @param out the file to write to
+   * @return the number of bytes written
+   * @throws IOException if an I/O error occurs when writing
+   */
+  public abstract int write(AudioInputStream ais, AudioFileFormat.Type type,
+                            File out)
+    throws IOException;
+
+  /**
+   * Write audio data to an output stream.
+   * @param ais the audio input stream to write
+   * @param type the desired audio file format type
+   * @param os the output stream
+   * @return the number of bytes written
+   * @throws IOException if an I/O error occurs when writing
+   */
+  public abstract int write(AudioInputStream ais, AudioFileFormat.Type type,
+                            OutputStream os)
+    throws IOException;
+}
diff --git a/libjava/classpath/javax/sound/sampled/spi/FormatConversionProvider.java b/libjava/classpath/javax/sound/sampled/spi/FormatConversionProvider.java
new file mode 100644
index 000000000..b9d3e9d10
--- /dev/null
+++ b/libjava/classpath/javax/sound/sampled/spi/FormatConversionProvider.java
@@ -0,0 +1,179 @@
+/* Format conversion API
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.sound.sampled.spi;
+
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioInputStream;
+
+/**
+ * A format conversion provider supplies methods for converting between
+ * different audio formats.  This abstract class defines the interface
+ * to this functionality; concrete subclasses will implement the methods
+ * declared here.
+ * @since 1.3
+ */
+public abstract class FormatConversionProvider
+{
+  /**
+   * Create a new format conversion provider.
+   */
+  public FormatConversionProvider()
+  {
+  }
+
+  /**
+   * Return an audio input stream given the desired target encoding and
+   * another audio input stream.  The data in the given stream will be
+   * converted to the desired encoding.
+   * @param encoding the encoding
+   * @param source the source audio input stream
+   * @return a new audio input stream
+   * @throws IllegalArgumentException if the conversion is not supported
+   */
+  public abstract AudioInputStream getAudioInputStream(AudioFormat.Encoding encoding,
+                                                       AudioInputStream source);
+
+  /**
+   * Return an audio input stream given the desired target format and
+   * another audio input stream.  The data in the given stream will be
+   * converted to the desired format.
+   * @param format the format
+   * @param source the source audio input stream
+   * @return a new audio input stream
+   * @throws IllegalArgumentException if the conversion is not supported
+   */
+  public abstract AudioInputStream getAudioInputStream(AudioFormat format,
+                                                       AudioInputStream source);
+
+  /**
+   * Return an array of all the source encodings supported by this conversion
+   * provider.
+   */
+  public abstract AudioFormat.Encoding[] getSourceEncodings();
+
+  /**
+   * Return an array of all the target encodings supported by this conversion
+   * provider.
+   */
+  public abstract AudioFormat.Encoding[] getTargetEncodings();
+
+  /**
+   * Return an array of all the target encodings that are available for a given
+   * source format.
+   * @param fmt the source format
+   * @return an array of supported target encodings
+   */
+  public abstract AudioFormat.Encoding[] getTargetEncodings(AudioFormat fmt);
+
+  /**
+   * Return a array of all the target formats that match given target encoding,
+   * and to which this provider can convert the source format.
+   * @param targ the target encoding to match
+   * @param src the source format
+   * @return an array of supported target formats
+   */
+  public abstract AudioFormat[] getTargetFormats(AudioFormat.Encoding targ,
+                                                 AudioFormat src);
+
+  /**
+   * Return true if this provider supports conversion from the given
+   * source format to the given target encoding.
+   * @param targ the target encoding
+   * @param src the source format
+   * @return true if the conversion is supported
+   */
+  public boolean isConversionSupported(AudioFormat.Encoding targ,
+                                       AudioFormat src)
+  {
+    AudioFormat.Encoding[] encodings = getTargetEncodings(src);
+    for (int i = 0; i < encodings.length; ++i)
+      {
+        if (targ.equals(encodings[i]))
+          return true;
+      }
+    return false;
+  }
+
+  /**
+   * Return true if this provider supports conversions from the given
+   * source format to the given target format.
+   * @param targ the source format
+   * @param src the target format
+   * @return true if the conversion is supported
+   */
+  public boolean isConversionSupported(AudioFormat targ, AudioFormat src)
+  {
+    AudioFormat[] encodings = getTargetFormats(targ.getEncoding(), src);
+    return encodings.length > 0;
+  }
+
+  /**
+   * Return true if an encoding matching the argument is supported as a
+   * source encoding by this provider.
+   * @param src the source encoding
+   * @return true if it is supported
+   */
+  public boolean isSourceEncodingSupported(AudioFormat.Encoding src)
+  {
+    AudioFormat.Encoding[] srcs = getSourceEncodings();
+    for (int i = 0; i < srcs.length; ++i)
+      {
+        if (src.equals(srcs[i]))
+          return true;
+      }
+    return false;
+  }
+
+  /**
+   * Return true if an encoding matching the argument is supported as a
+   * target encoding by this provider.
+   * @param targ the target encoding
+   * @return true if it is supported
+   */
+  public boolean isTargetEncodingSupported(AudioFormat.Encoding targ)
+  {
+    AudioFormat.Encoding[] encodings = getTargetEncodings();
+    for (int i = 0; i < encodings.length; ++i)
+      {
+        if (targ.equals(encodings[i]))
+          return true;
+      }
+    return false;
+  }
+}
diff --git a/libjava/classpath/javax/sound/sampled/spi/MixerProvider.java b/libjava/classpath/javax/sound/sampled/spi/MixerProvider.java
new file mode 100644
index 000000000..72b972497
--- /dev/null
+++ b/libjava/classpath/javax/sound/sampled/spi/MixerProvider.java
@@ -0,0 +1,86 @@
+/* Mixer API
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.sound.sampled.spi;
+
+import javax.sound.sampled.Mixer;
+
+/**
+ * This abstract class defines an interface to mixer providers.
+ * Concrete subclasses will implement the methods in this class.
+ * @since 1.3
+ */
+public abstract class MixerProvider
+{
+  /**
+   * Create a new mixer provider.
+   */
+  public MixerProvider()
+  {
+  }
+
+  /**
+   * Return a mixer that matches the given info object.
+   * @param info description of the mixer to match
+   * @return the mixer
+   * @throws IllegalArgumentException if no mixer matches the description
+   */
+  public abstract Mixer getMixer(Mixer.Info info);
+
+  /**
+   * Return an array of info objects describing all the mixers provided by
+   * this provider.
+   */
+  public abstract Mixer.Info[] getMixerInfo();
+
+  /**
+   * Return true if a mixer matching the provided description is supported.
+   * @param info description of the mixer to match
+   * @return true if it is supported by this provider
+   */
+  public boolean isMixerSupported(Mixer.Info info)
+  {
+    Mixer.Info[] infos = getMixerInfo();
+    for (int i = 0; i < infos.length; ++i)
+      {
+        if (info.equals(infos[i]))
+          return true;
+      }
+    return false;
+  }
+}