Major merge with Classpath.

	Removed many duplicate files.
	* HACKING: Updated.x
	* classpath: Imported new directory.
	* standard.omit: New file.
	* Makefile.in, aclocal.m4, configure: Rebuilt.
	* sources.am: New file.
	* configure.ac: Run Classpath configure script.  Moved code around
	to support.  Disable xlib AWT peers (temporarily).
	* Makefile.am (SUBDIRS): Added 'classpath'
	(JAVAC): Removed.
	(AM_CPPFLAGS): Added more -I options.
	(BOOTCLASSPATH): Simplified.
	Completely redid how sources are built.
	Include sources.am.
	* include/Makefile.am (tool_include__HEADERS): Removed jni.h.
	* include/jni.h: Removed (in Classpath).
	* scripts/classes.pl: Updated to look at built classes.
	* scripts/makemake.tcl: New file.
	* testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Added
	-I options.
	(gcj_jni_invocation_compile_c_to_binary): Likewise.


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

1 files changed, 0 insertions, 153 deletions

diff --git a/libjava/gnu/java/nio/charset/UTF_16Encoder.java b/libjava/gnu/java/nio/charset/UTF_16Encoder.java
deleted file mode 100644
index ae613355171..00000000000
--- a/libjava/gnu/java/nio/charset/UTF_16Encoder.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/* UTF_16Encoder.java -- 
-   Copyright (C) 2002 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 gnu.java.nio.charset;
-
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CoderResult;
-
-/**
- * Encoder for UTF-16, UTF-15LE, and UTF-16BE.
- *
- * @author Jesse Rosenstock
- */
-final class UTF_16Encoder extends CharsetEncoder
-{
-  // byte orders
-  static final int BIG_ENDIAN = 0;
-  static final int LITTLE_ENDIAN = 1;
-
-  private static final char BYTE_ORDER_MARK = '\uFEFF';
-
-  private final int byteOrder;
-  private final boolean useByteOrderMark;
-  private boolean needsByteOrderMark;
-
-  UTF_16Encoder (Charset cs, int byteOrder, boolean useByteOrderMark)
-  {
-    super (cs, 2.0f,
-           useByteOrderMark ? 2.0f : 4.0f,
-           byteOrder == BIG_ENDIAN
-             ? new byte[] { (byte) 0xFF, (byte) 0xFD }
-             : new byte[] { (byte) 0xFD, (byte) 0xFF });
-    this.byteOrder = byteOrder;
-    this.useByteOrderMark = useByteOrderMark;
-    this.needsByteOrderMark = useByteOrderMark;
-  }
-
-  protected CoderResult encodeLoop (CharBuffer in, ByteBuffer out)
-  {
-    // TODO: Optimize this in the case in.hasArray() / out.hasArray()
-
-    if (needsByteOrderMark)
-      {
-        if (out.remaining () < 2)
-          return CoderResult.OVERFLOW;
-        put (out, BYTE_ORDER_MARK);
-        needsByteOrderMark = false;
-      }
-
-    int inPos = in.position ();
-    try
-      {
-        while (in.hasRemaining ())
-          {
-            char c = in.get ();
-
-            if (0xD800 <= c && c <= 0xDFFF)
-              {
-                // c is a surrogate
-
-                // make sure c is a high surrogate
-                if (c > 0xDBFF)
-                  return CoderResult.malformedForLength (1);
-                if (in.remaining () < 1)
-                  return CoderResult.UNDERFLOW;
-                char d = in.get ();
-                // make sure d is a low surrogate
-                if (d < 0xDC00 || d > 0xDFFF)
-                  return CoderResult.malformedForLength (1);
-                put (out, c);
-                put (out, d);
-                inPos += 2;
-              }
-            else
-              {
-                if (out.remaining () < 2)
-                  return CoderResult.OVERFLOW;
-                put (out, c);
-                inPos++;
-              }
-          }
-
-        return CoderResult.UNDERFLOW;
-      }
-    finally
-      {
-        in.position (inPos);
-      }
-  }
-
-  /**
-   * Writes <code>c</code> to <code>out</code> in the byte order
-   * specified by <code>byteOrder</code>.
-   **/
-  private void put (ByteBuffer out, char c)
-  {
-    if (byteOrder == BIG_ENDIAN)
-      {
-        out.put ((byte) (c >> 8));
-        out.put ((byte) (c & 0xFF));
-      }
-    else
-      {
-        out.put ((byte) (c & 0xFF));
-        out.put ((byte) (c >> 8));
-      }
-  }
-
-  protected void implReset ()
-  {
-    needsByteOrderMark = useByteOrderMark;
-  }
-
-  // TODO: override canEncode(char) and canEncode(CharSequence)
-  // for performance
-}