From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Cc: Iain Sandoe <idsandoe@googlemail.com>
Subject: [PATCH] libstdc++: Enable std::text_encoding for darwin and FreeBSD
Date: Tue, 30 Jan 2024 15:02:04 +0000 [thread overview]
Message-ID: <20240130150216.1790473-1-jwakely@redhat.com> (raw)
This should fix the std/text_encoding/* FAILs that Iain sees on darwin.
I assume it will make it work for FreeBSD too.
I won't push this until I hear it works for at least one of those.
Tested x86_64-linux.
-- >8 --
The <xlocale.h> header is needed for newlocale and locale_t on these
targets.
libstdc++-v3/ChangeLog:
* acinclude.m4 (GLIBCXX_CHECK_TEXT_ENCODING): Use <xlocale.h> if
needed for newlocale.
* configure: Regenerate.
* src/c++26/text_encoding.cc: Use <xlocale.h>.
---
libstdc++-v3/acinclude.m4 | 3 +++
libstdc++-v3/configure | 3 +++
libstdc++-v3/src/c++26/text_encoding.cc | 3 +++
3 files changed, 9 insertions(+)
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index f9ba7ef744b..f72bd0f45b8 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -5834,6 +5834,9 @@ AC_LANG_SAVE
AC_MSG_CHECKING([whether nl_langinfo_l is defined in <langinfo.h>])
AC_TRY_COMPILE([
#include <locale.h>
+ #if __has_include(<xlocale.h>)
+ # include <xlocale.h>
+ #endif
#include <langinfo.h>
],[
locale_t loc = newlocale(LC_ALL_MASK, "", (locale_t)0);
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 65ce679f1bd..f4bc0486768 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -54533,6 +54533,9 @@ $as_echo_n "checking whether nl_langinfo_l is defined in <langinfo.h>... " >&6;
/* end confdefs.h. */
#include <locale.h>
+ #if __has_include(<xlocale.h>)
+ # include <xlocale.h>
+ #endif
#include <langinfo.h>
int
diff --git a/libstdc++-v3/src/c++26/text_encoding.cc b/libstdc++-v3/src/c++26/text_encoding.cc
index 33c6c07820c..b9a50ef1a00 100644
--- a/libstdc++-v3/src/c++26/text_encoding.cc
+++ b/libstdc++-v3/src/c++26/text_encoding.cc
@@ -27,6 +27,9 @@
#ifdef _GLIBCXX_USE_NL_LANGINFO_L
#include <locale.h>
+#if __has_include(<xlocale.h>)
+# include <xlocale.h>
+#endif
#include <langinfo.h>
#if __CHAR_BIT__ == 8
--
2.43.0
next reply other threads:[~2024-01-30 15:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-30 15:02 Jonathan Wakely [this message]
2024-01-31 9:38 ` Iain Sandoe
2024-01-31 9:55 ` Jonathan Wakely
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=20240130150216.1790473-1-jwakely@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=idsandoe@googlemail.com \
--cc=libstdc++@gcc.gnu.org \
/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).