From a02fb766e2bd09958418153795b9d41a6cc6e22c Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 17 Aug 2001 18:09:24 +0000
Subject: [PATCH] * gnu/gcj/convert/IOConverter.java: Add `646' alias.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44965 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 4 ++++
libjava/gnu/gcj/convert/IOConverter.java | 5 +++++
2 files changed, 9 insertions(+)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ae57a887d69e..12c86fc5cc76 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-17 Tom Tromey <tromey@redhat.com>
+
+ * gnu/gcj/convert/IOConverter.java: Add `646' alias.
+
2001-08-17 Hans-J. Boehm <Hans_Boehm@hp.com>
* BigInteger.java: fix right shifts by nonzero multiples of 32.
diff --git a/libjava/gnu/gcj/convert/IOConverter.java b/libjava/gnu/gcj/convert/IOConverter.java
index ccb994f56ef1..353f31c609cd 100644
--- a/libjava/gnu/gcj/convert/IOConverter.java
+++ b/libjava/gnu/gcj/convert/IOConverter.java
@@ -27,6 +27,11 @@ public abstract class IOConverter
// Manually maintained aliases. Note that the value must be our
// canonical name.
hash.put ("iso-latin-1", "8859_1");
+ // On Solaris the default encoding, as returned by nl_langinfo(),
+ // is `646' (aka ASCII), but the Solaris iconv_open() doesn't
+ // understand that. We work around the problem by adding an
+ // explicit alias for Solaris users.
+ hash.put ("646", "ASCII");
// 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");
--
GitLab