diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-11-04 15:08:18 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-11-04 15:08:18 +0000 |
| commit | 1b38125a351762b5f269822d4af61c16f53a6ddc (patch) | |
| tree | 7c4f49c9293c904df002c3dc133b0392c58ccd41 /libjava/gnu/gcj | |
| parent | d3585b76d63dd41df119b0118adb37dfe06867c0 (diff) | |
| download | gcc-1b38125a351762b5f269822d4af61c16f53a6ddc.zip gcc-1b38125a351762b5f269822d4af61c16f53a6ddc.tar.gz gcc-1b38125a351762b5f269822d4af61c16f53a6ddc.tar.bz2 | |
PR libgcj/14358, libgcj/24552:
* gnu/gcj/convert/IOConverter.java: Regenerate aliases. Add
aliases for 'euc_jp' and 'eucjp'.
* scripts/encodings.pl: Recognize 'none', not 'NONE'. Include
canonical names in output.
(%map): Added UnicodeLittle and UnicodeBig.
From-SVN: r106490
Diffstat (limited to 'libjava/gnu/gcj')
| -rw-r--r-- | libjava/gnu/gcj/convert/IOConverter.java | 51 |
1 files changed, 29 insertions, 22 deletions
diff --git a/libjava/gnu/gcj/convert/IOConverter.java b/libjava/gnu/gcj/convert/IOConverter.java index 2c6849c..a0d4667 100644 --- a/libjava/gnu/gcj/convert/IOConverter.java +++ b/libjava/gnu/gcj/convert/IOConverter.java @@ -28,6 +28,8 @@ public abstract class IOConverter // canonical name. hash.put ("iso-latin-1", "8859_1"); hash.put ("iso8859_1", "8859_1"); + hash.put ("utf-16le", "UnicodeLittle"); + hash.put ("utf-16be", "UnicodeBig"); // At least one build script out there uses 'utf8'. hash.put ("utf8", "UTF8"); // On Solaris the default encoding, as returned by nl_langinfo(), @@ -35,39 +37,44 @@ public abstract class IOConverter // understand that. We work around the problem by adding an // explicit alias for Solaris users. hash.put ("646", "ASCII"); + + // See PR 24552, PR 14358. + hash.put ("euc_jp", "EUCJIS"); + hash.put ("eucjp", "EUCJIS"); + // All aliases after this point are automatically generated by the // `encodings.pl' script. Run it to make any corrections. hash.put ("ansi_x3.4-1968", "ASCII"); - hash.put ("iso-ir-6", "ASCII"); hash.put ("ansi_x3.4-1986", "ASCII"); - hash.put ("iso_646.irv:1991", "ASCII"); hash.put ("ascii", "ASCII"); - hash.put ("iso646-us", "ASCII"); - hash.put ("us-ascii", "ASCII"); - hash.put ("us", "ASCII"); - hash.put ("ibm367", "ASCII"); hash.put ("cp367", "ASCII"); + hash.put ("cp819", "8859_1"); hash.put ("csascii", "ASCII"); - hash.put ("iso_8859-1:1987", "8859_1"); + hash.put ("cseucpkdfmtjapanese", "EUCJIS"); + hash.put ("csisolatin1", "8859_1"); + hash.put ("csshiftjis", "SJIS"); + hash.put ("euc-jp", "EUCJIS"); + hash.put ("extended_unix_code_packed_format_for_japanese", "EUCJIS"); + hash.put ("ibm367", "ASCII"); + hash.put ("ibm819", "8859_1"); + hash.put ("iso-8859-1", "8859_1"); hash.put ("iso-ir-100", "8859_1"); + hash.put ("iso-ir-6", "ASCII"); + hash.put ("iso646-us", "ASCII"); + hash.put ("iso_646.irv:1991", "ASCII"); hash.put ("iso_8859-1", "8859_1"); - hash.put ("iso-8859-1", "8859_1"); - hash.put ("latin1", "8859_1"); + hash.put ("iso_8859-1:1987", "8859_1"); hash.put ("l1", "8859_1"); - hash.put ("ibm819", "8859_1"); - hash.put ("cp819", "8859_1"); - hash.put ("csisolatin1", "8859_1"); - hash.put ("utf-8", "UTF8"); - hash.put ("none", "UTF8"); - hash.put ("shift_jis", "SJIS"); + hash.put ("latin1", "8859_1"); hash.put ("ms_kanji", "SJIS"); - hash.put ("csshiftjis", "SJIS"); - hash.put ("extended_unix_code_packed_format_for_japanese", "EUCJIS"); - hash.put ("cseucpkdfmtjapanese", "EUCJIS"); - hash.put ("euc-jp", "EUCJIS"); - hash.put ("euc-jp", "EUCJIS"); - hash.put ("utf-16le", "UnicodeLittle"); - hash.put ("utf-16be", "UnicodeBig"); + hash.put ("shift_jis", "SJIS"); + hash.put ("us", "ASCII"); + hash.put ("us-ascii", "ASCII"); + hash.put ("utf-8", "UTF8"); + hash.put ("utf16-be", "UnicodeBig"); + hash.put ("utf16-le", "UnicodeLittle"); + // End script-generated section. + iconv_byte_swap = iconv_init (); } |