public inbox for gcc-bugs@sourceware.org help / color / mirror / Atom feed
From: "redi at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org> To: gcc-bugs@gcc.gnu.org Subject: [Bug libstdc++/99832] std::chrono::system_clock::to_time_t needs ABI tag for 32-bit time_t Date: Wed, 31 Jan 2024 11:49:04 +0000 [thread overview] Message-ID: <bug-99832-4-XbxbboU90K@http.gcc.gnu.org/bugzilla/> (raw) In-Reply-To: <bug-99832-4@http.gcc.gnu.org/bugzilla/> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99832 --- Comment #1 from Jonathan Wakely <redi at gcc dot gnu.org> --- Maybe something like this: diff --git a/libstdc++-v3/config/os/gnu-linux/os_defines.h b/libstdc++-v3/config/os/gnu-linux/os_defines.h index 0af29325388..f7c73560831 100644 --- a/libstdc++-v3/config/os/gnu-linux/os_defines.h +++ b/libstdc++-v3/config/os/gnu-linux/os_defines.h @@ -84,7 +84,13 @@ // Since glibc 2.34 all pthreads functions are usable without linking to // libpthread. # define _GLIBCXX_GTHREAD_USE_WEAK 0 -# endif +// Since glibc 2.34 using -D_TIME_BITS=64 will enable 64-bit time_t +// for "legacy ABIs", i.e. ones that historically used 32-bit time_t. +// This internal glibc macro will be defined iff new 64-bit time_t is in use. +# ifdef __USE_TIME_BITS64 +# define _GLIBCXX_TIME_BITS64 1 +# endif +# endif // glibc 2.34 #endif // __linux__ #endif diff --git a/libstdc++-v3/include/bits/chrono.h b/libstdc++-v3/include/bits/chrono.h index 579c5a266be..a63782b92ff 100644 --- a/libstdc++-v3/include/bits/chrono.h +++ b/libstdc++-v3/include/bits/chrono.h @@ -1242,6 +1242,9 @@ _GLIBCXX_BEGIN_INLINE_ABI_NAMESPACE(_V2) now() noexcept; // Map to C API +#ifdef _GLIBCXX_TIME_BITS64 + [[__gnu__::__abi_tag__("__time64")]] +#endif static std::time_t to_time_t(const time_point& __t) noexcept { @@ -1249,6 +1252,9 @@ _GLIBCXX_BEGIN_INLINE_ABI_NAMESPACE(_V2) (__t.time_since_epoch()).count()); } +#ifdef _GLIBCXX_TIME_BITS64 + [[__gnu__::__abi_tag__("__time64")]] +#endif static time_point from_time_t(std::time_t __t) noexcept { Alternatively, in <bits/c++config.h> do: #define _GLIBCXX_TIME_BITS64_ABI_TAG and then in config/os/gnu-linux/os_defines.h: # ifdef __USE_TIME_BITS64 # undef _GLIBCXX_TIME_BITS64_ABI_TAG # define _GLIBCXX_TIME_BITS64_ABI_TAG [[__gnu__::__abi_tag__("__time64")]] # endif Then the chrono code can just use that unconditionally instead of using #ifdef I think for musl, newer versions use 64-bit time_t unconditionally. I'm not sure if we can (or need to) use the abi_tag there.
next prev parent reply other threads:[~2024-01-31 11:49 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-30 16:01 [Bug libstdc++/99832] New: " redi at gcc dot gnu.org 2023-06-10 9:33 ` [Bug libstdc++/99832] " redi at gcc dot gnu.org 2023-07-19 18:24 ` redi at gcc dot gnu.org 2024-01-31 11:49 ` redi at gcc dot gnu.org [this message] 2024-01-31 12:05 ` redi at gcc dot gnu.org 2024-05-07 7:39 ` rguenth at gcc dot gnu.org
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=bug-99832-4-XbxbboU90K@http.gcc.gnu.org/bugzilla/ \ --to=gcc-bugzilla@gcc.gnu.org \ --cc=gcc-bugs@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: linkBe 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).