aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/charset.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 89c5407..f0cbe8e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-17 Tom Tromey <tromey@redhat.com>
+
+ * charset.c (_initialize_charset): Add special case for "646".
+
2009-04-17 Carlos O'Donell <carlos@codesourcery.com>
* configure.ac: AC_SUBST datarootdir, docdir, htmldir, pdfdir.
diff --git a/gdb/charset.c b/gdb/charset.c
index c774638..43b69ec 100644
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -817,6 +817,10 @@ _initialize_charset (void)
#ifndef PHONY_ICONV
#ifdef HAVE_LANGINFO_CODESET
auto_host_charset_name = nl_langinfo (CODESET);
+ /* Solaris will return `646' here -- but the Solaris iconv then
+ does not accept this. */
+ if (!strcmp (auto_host_charset_name, "646"))
+ auto_host_charset_name = "ASCII";
target_charset_name = auto_host_charset_name;
set_be_le_names ();