From: Tom Tromey <tromey@redhat.com>
To: "Pierre Muller" <pierre.muller@ics-cnrs.unistra.fr>
Cc: "'Joel Brobecker'" <brobecker@adacore.com>, <gdb-patches@sourceware.org>
Subject: Re: Your INTERMEDIATE_ENCODING patch for Solaris
Date: Wed, 18 Aug 2010 16:12:00 -0000 [thread overview]
Message-ID: <m38w43dho9.fsf@fleche.redhat.com> (raw)
In-Reply-To: <15264.6257346079$1282142643@news.gmane.org> (Pierre Muller's message of "Wed, 18 Aug 2010 16:43:33 +0200")
>>>>> "Pierre" == Pierre Muller <pierre.muller@ics-cnrs.unistra.fr> writes:
Pierre> Upon further investigation, I must confess that the OpenSolaris
Pierre> situation is a real mess:
Pierre> I get a working libiconv version for x86_64 solaris
Pierre> using CSW libiconv version 0x10D,
From the version number, I guess this is GNU libiconv.
What happens if you don't build with libiconv, but rely instead on the
iconv in the Solaris libc?
Pierre> libiconv_open with parameter 'wchar_t' and 'UTF-8' works.
Pierre> but on my Sparc64 test machine, libiconv is
Pierre> on /usr/local/lib and its version is 0x10B.
Pierre> This later version fails on calls to libiconv_open
Pierre> with 'wchar_t' and 'ASCII'.
Ouch, but ok. We can check _LIBICONV_VERSION >= 0x10D.
This actually simplifies the patch a little; I didn't know about
_LIBICONV_VERSION before.
Could you try this? I also fixed the INTERMEDIATE_ENCODING problem you
pointed out.
Tom
2010-08-17 Tom Tromey <tromey@redhat.com>
* gdb_wchar.h: Check _LIBICONV_VERSION, __STDC_ISO_10646__.
Change how INTERMEDIATE_ENCODING is defined.
diff --git a/gdb/gdb_wchar.h b/gdb/gdb_wchar.h
index fca3fe4..78f59a1 100644
--- a/gdb/gdb_wchar.h
+++ b/gdb/gdb_wchar.h
@@ -23,7 +23,11 @@
Capable systems have the full suite: wchar_t support and iconv
(perhaps via GNU libiconv). On these machines, full functionality
- is available.
+ is available. Note that full functionality is dependent on us
+ being able to convert from an arbitrary encoding to wchar_t. In
+ practice this means we look for __STDC_ISO_10646__ (where we know
+ the name of the wchar_t encoding) or GNU libiconv, where we can use
+ "wchar_t".
DJGPP is known to have libiconv but not wchar_t support. On
systems like this, we use the narrow character functions. The full
@@ -35,8 +39,6 @@
wrappers for the wchar_t functionality we use. */
-#define INTERMEDIATE_ENCODING "wchar_t"
-
#if defined (HAVE_ICONV)
#include <iconv.h>
#else
@@ -45,9 +47,15 @@
#define PHONY_ICONV
#endif
-/* We use "btowc" as a sentinel to detect functioning wchar_t
- support. */
-#if defined (HAVE_ICONV) && defined (HAVE_WCHAR_H) && defined (HAVE_BTOWC)
+/* We use "btowc" as a sentinel to detect functioning wchar_t support.
+ We check for either __STDC_ISO_10646__ or a new-enough libiconv in
+ order to ensure we can convert to and from wchar_t. We choose
+ libiconv version 0x10D because it was reported that earlier
+ versions do not always accept "wchar_t" as an encoding argument on
+ Solaris. */
+#if defined (HAVE_ICONV) && defined (HAVE_WCHAR_H) && defined (HAVE_BTOWC) \
+ && (defined (__STDC_ISO_10646__) \
+ || defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x10D)
#include <wchar.h>
#include <wctype.h>
@@ -63,6 +71,25 @@ typedef wint_t gdb_wint_t;
#define LCST(X) L ## X
+/* If __STDC_ISO_10646__ is defined, then the host wchar_t is UCS-4.
+ We exploit this fact in the hope that there are hosts that define
+ this but which do not support "wchar_t" as an encoding argument to
+ iconv_open. We put the endianness into the encoding name to avoid
+ hosts that emit a BOM when the unadorned name is used. */
+#if defined (__STDC_ISO_10646__)
+#if WORDS_BIGENDIAN
+#define INTERMEDIATE_ENCODING "UCS-4BE"
+#else
+#define INTERMEDIATE_ENCODING "UCS-4LE"
+#endif
+#elif defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x10D
+#define INTERMEDIATE_ENCODING "wchar_t"
+#else
+/* This shouldn't happen, because the earlier #if should have filtered
+ out this case. */
+#error "Neither __STDC_ISO_10646__ nor _LIBICONV_VERSION defined"
+#endif
+
#else
typedef char gdb_wchar_t;
@@ -80,8 +107,9 @@ typedef int gdb_wint_t;
narrow encoding as our intermediate encoding. However, if we are
also providing a phony iconv, we might as well just stick with
"wchar_t". */
-#ifndef PHONY_ICONV
-#undef INTERMEDIATE_ENCODING
+#ifdef PHONY_ICONV
+#define INTERMEDIATE_ENCODING "wchar_t"
+#else
#define INTERMEDIATE_ENCODING host_charset ()
#endif
next prev parent reply other threads:[~2010-08-18 16:12 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-31 16:25 Kazu Hirata
2010-08-05 18:40 ` Tom Tromey
2010-08-10 20:28 ` Daniel Jacobowitz
2010-08-17 18:06 ` Tom Tromey
2010-08-17 18:44 ` Joel Brobecker
2010-08-17 19:03 ` Tom Tromey
2010-08-18 10:14 ` Joel Brobecker
2010-08-18 14:43 ` Pierre Muller
2010-08-18 14:52 ` Joel Brobecker
2010-08-18 15:10 ` Pierre Muller
2010-08-18 15:35 ` Tom Tromey
2010-08-18 15:44 ` Tom Tromey
2010-08-18 16:36 ` Joel Brobecker
2010-08-18 17:35 ` Tom Tromey
2010-08-18 17:41 ` Joel Brobecker
[not found] ` <15264.6257346079$1282142643@news.gmane.org>
2010-08-18 16:12 ` Tom Tromey [this message]
2010-08-19 15:03 ` Pierre Muller
2010-08-19 16:09 ` Tom Tromey
2010-08-30 18:01 ` Tom Tromey
2010-08-31 9:25 ` Pierre Muller
2010-08-31 16:47 ` Tom Tromey
2010-09-01 7:30 ` Pierre Muller
[not found] ` <44796.6229789474$1283326243@news.gmane.org>
2010-09-01 22:35 ` Tom Tromey
2010-09-02 14:21 ` Pierre Muller
2010-09-02 15:39 ` Tom Tromey
2010-09-14 21:29 ` Tom Tromey
2010-09-15 17:20 ` Pierre Muller
2010-09-16 7:55 ` Tom Tromey
2010-09-16 9:49 ` Pierre Muller
2010-09-16 20:22 ` Tom Tromey
2010-09-16 22:31 ` Pierre Muller
[not found] ` <20078.2261243605$1284672670@news.gmane.org>
2010-09-17 9:21 ` Tom Tromey
2010-09-17 13:48 ` Pierre Muller
2010-09-23 13:00 ` Tom Tromey
2010-09-23 14:48 ` Pierre Muller
2010-09-27 18:42 ` Tom Tromey
2010-09-16 17:51 ` [patch] Regression on py-prettyprint.exp: print estring [Re: Your INTERMEDIATE_ENCODING patch for Solaris] Jan Kratochvil
2010-09-16 20:33 ` Tom Tromey
2010-09-16 20:44 ` Jan Kratochvil
2010-08-18 11:52 ` Your INTERMEDIATE_ENCODING patch for Solaris Pierre Muller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m38w43dho9.fsf@fleche.redhat.com \
--to=tromey@redhat.com \
--cc=brobecker@adacore.com \
--cc=gdb-patches@sourceware.org \
--cc=pierre.muller@ics-cnrs.unistra.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).