diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-01-03 22:58:31 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-01-03 22:58:31 +0000 |
| commit | 8a0383655d7d869ef9d344202c78ce3659927052 (patch) | |
| tree | 82dbb00c69057da2d374d746d77eb40854b23164 /libjava/Makefile.in | |
| parent | bd63b9439095ee94c8dd44ea2225d9db2a2db2c2 (diff) | |
| download | ppe42-gcc-8a0383655d7d869ef9d344202c78ce3659927052.tar.gz ppe42-gcc-8a0383655d7d869ef9d344202c78ce3659927052.zip | |
PR libgcj/9715, PR libgcj/19132:
* java/nio/charset/Charset.java (charsetForName): Try default
provider first.
(availableCharsets): Re-merged.
(providers2): Likewise.
(defaultCharset): Likewise.
* sources.am, Makefile.in: Rebuilt.
* gnu/java/nio/charset/Provider.java: Removed.
* java/io/OutputStreamWriter.java
(OutputStreamWriter(OutputStream,Charset)): New constructor.
(OutputStreamWriter(OutputStream,CharsetEncoder)): Likewise.
* java/io/InputStreamReader.java
(InputStreamReader(InputStream,CharsetDecoder)): New constructor.
(InputStreamReader(InputStream,Charset)): Likewise.
* gnu/gcj/convert/BytesToUnicode.java (getDecoder): Try a
BytesToCharsetAdaptor.
* gnu/gcj/convert/UnicodeToBytes.java (getEncoder): Try a
CharsetToBytesAdaptor.
* gnu/gcj/convert/CharsetToBytesAdaptor.java: New file.
* gnu/gcj/convert/BytesToCharsetAdaptor.java: New file.
* mauve-libgcj: Remove getEncoding exclusion.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109294 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.in')
| -rw-r--r-- | libjava/Makefile.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 82aeb41d6a1..cec8b3875a8 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -1134,7 +1134,9 @@ gnu/gcj/RawDataManaged.java gnu_gcj_header_files = $(patsubst %.java,%.h,$(gnu_gcj_source_files)) gnu_gcj_convert_source_files = \ +gnu/gcj/convert/BytesToCharsetAdaptor.java \ gnu/gcj/convert/BytesToUnicode.java \ +gnu/gcj/convert/CharsetToBytesAdaptor.java \ gnu/gcj/convert/Convert.java \ gnu/gcj/convert/IOConverter.java \ gnu/gcj/convert/Input_8859_1.java \ @@ -1708,7 +1710,7 @@ classpath/gnu/java/nio/charset/MacRomania.java \ classpath/gnu/java/nio/charset/MacSymbol.java \ classpath/gnu/java/nio/charset/MacThai.java \ classpath/gnu/java/nio/charset/MacTurkish.java \ -gnu/java/nio/charset/Provider.java \ +classpath/gnu/java/nio/charset/Provider.java \ classpath/gnu/java/nio/charset/US_ASCII.java \ classpath/gnu/java/nio/charset/UTF_16.java \ classpath/gnu/java/nio/charset/UTF_16BE.java \ |
