From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: Re: [PATCH] libstdc++: Fix __cpp_lib_chrono for old std::string ABI
Date: Fri, 21 Jun 2024 10:16:03 +0100 [thread overview]
Message-ID: <CACb0b4njZJ-gaev=DGn8E4LMSRM4K266wx8Tet0aRP18NMZKmQ@mail.gmail.com> (raw)
In-Reply-To: <20240620152702.2019696-1-jwakely@redhat.com>
Pushed to trunk now. Backport to gcc-14 needed too.
On Thu, 20 Jun 2024 at 16:27, Jonathan Wakely <jwakely@redhat.com> wrote:
>
> This unfortunately means we can never increase __cpp_lib_chrono again
> for the old string ABI, but I don't see any alternative (except
> supporting chrono::tzdb for the old string, which will be a lot of work
> that I don't want to do!)
>
> -- >8 --
>
> The <chrono> header is incomplete for the old std::string ABI, because
> std::chrono::tzdb is only defined for the new ABI. The feature test
> macro advertising full C++20 support should not be defined for the old
> ABI.
>
> libstdc++-v3/ChangeLog:
>
> * include/bits/version.def (chrono): Add cxx11abi = yes.
> * include/bits/version.h: Regenerate.
> * testsuite/std/time/syn_c++20.cc: Adjust expected value for
> the feature test macro.
> ---
> libstdc++-v3/include/bits/version.def | 1 +
> libstdc++-v3/include/bits/version.h | 2 +-
> libstdc++-v3/testsuite/std/time/syn_c++20.cc | 11 +++++++++--
> 3 files changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/libstdc++-v3/include/bits/version.def b/libstdc++-v3/include/bits/version.def
> index 683b967d54b..42cdef2f526 100644
> --- a/libstdc++-v3/include/bits/version.def
> +++ b/libstdc++-v3/include/bits/version.def
> @@ -574,6 +574,7 @@ ftms = {
> v = 201907;
> cxxmin = 20;
> hosted = yes;
> + cxx11abi = yes; // std::chrono::tzdb requires cxx11 std::string
> };
> values = {
> v = 201611;
> diff --git a/libstdc++-v3/include/bits/version.h b/libstdc++-v3/include/bits/version.h
> index 4850041c0a3..1eaf3733bc2 100644
> --- a/libstdc++-v3/include/bits/version.h
> +++ b/libstdc++-v3/include/bits/version.h
> @@ -639,7 +639,7 @@
> #undef __glibcxx_want_boyer_moore_searcher
>
> #if !defined(__cpp_lib_chrono)
> -# if (__cplusplus >= 202002L) && _GLIBCXX_HOSTED
> +# if (__cplusplus >= 202002L) && _GLIBCXX_USE_CXX11_ABI && _GLIBCXX_HOSTED
> # define __glibcxx_chrono 201907L
> # if defined(__glibcxx_want_all) || defined(__glibcxx_want_chrono)
> # define __cpp_lib_chrono 201907L
> diff --git a/libstdc++-v3/testsuite/std/time/syn_c++20.cc b/libstdc++-v3/testsuite/std/time/syn_c++20.cc
> index f0b86199e9d..4a527262e9d 100644
> --- a/libstdc++-v3/testsuite/std/time/syn_c++20.cc
> +++ b/libstdc++-v3/testsuite/std/time/syn_c++20.cc
> @@ -20,9 +20,16 @@
>
> #include <chrono>
>
> +// std::chrono::tzdb is not defined for the old std::string ABI.
> +#if _GLIBCXX_USE_CXX_ABI
> +# define EXPECTED_VALUE 201907L
> +#else
> +# define EXPECTED_VALUE 201611L
> +#endif
> +
> #ifndef __cpp_lib_chrono
> # error "Feature test macro for chrono is missing in <chrono>"
> -#elif __cpp_lib_chrono < 201907L
> +#elif __cpp_lib_chrono < EXPECTED_VALUE
> # error "Feature test macro for chrono has wrong value in <chrono>"
> #endif
>
> @@ -94,7 +101,7 @@ namespace __gnu_test
> using std::chrono::make12;
> using std::chrono::make24;
>
> -#if _GLIBCXX_USE_CXX11_ABI
> +#if __cpp_lib_chrono >= 201803L
> using std::chrono::tzdb;
> using std::chrono::tzdb_list;
> using std::chrono::get_tzdb;
> --
> 2.45.2
>
prev parent reply other threads:[~2024-06-21 9:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-20 15:25 Jonathan Wakely
2024-06-21 9:16 ` Jonathan Wakely [this message]
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='CACb0b4njZJ-gaev=DGn8E4LMSRM4K266wx8Tet0aRP18NMZKmQ@mail.gmail.com' \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--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).