public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-5170] libstdc++: Implement std::chrono::current_zone() for AIX [PR108409]
@ 2023-01-14 21:59 Jonathan Wakely
0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2023-01-14 21:59 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:d80e5a7b30e5d045c808f5235123e366e4e9286c
commit r13-5170-gd80e5a7b30e5d045c808f5235123e366e4e9286c
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Sat Jan 14 20:13:32 2023 +0000
libstdc++: Implement std::chrono::current_zone() for AIX [PR108409]
libstdc++-v3/ChangeLog:
PR libstdc++/108409
* src/c++20/tzdb.cc (current_zone()) [_AIX]: Use TZ environment
variable.
Diff:
---
libstdc++-v3/src/c++20/tzdb.cc | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/libstdc++-v3/src/c++20/tzdb.cc b/libstdc++-v3/src/c++20/tzdb.cc
index a37859dffdb..eaaea367f4f 100644
--- a/libstdc++-v3/src/c++20/tzdb.cc
+++ b/libstdc++-v3/src/c++20/tzdb.cc
@@ -34,6 +34,10 @@
#include <mutex> // mutex
#include <filesystem> // filesystem::read_symlink
+#ifndef _AIX
+# include <cstdlib> // getenv
+#endif
+
#ifndef __GTHREADS
# define USE_ATOMIC_SHARED_PTR 0
#elif _WIN32
@@ -1625,6 +1629,7 @@ namespace std::chrono
{
// TODO cache this function's result?
+#ifndef _AIX
error_code ec;
// This should be a symlink to e.g. /usr/share/zoneinfo/Europe/London
auto path = filesystem::read_symlink("/etc/localtime", ec);
@@ -1655,11 +1660,25 @@ namespace std::chrono
if (auto tz = do_locate_zone(this->zones, this->links, name))
return tz;
}
-
- // TODO AIX stores current zone in $TZ in /etc/environment but the value
+#else
+ // AIX stores current zone in $TZ in /etc/environment but the value
// is typically a POSIX time zone name, not IANA zone.
// https://developer.ibm.com/articles/au-aix-posix/
// https://www.ibm.com/support/pages/managing-time-zone-variable-posix
+ if (const char* env = std::getenv("TZ"))
+ {
+ string_view s(env);
+ if (s == "GMT0")
+ s = "Etc/GMT";
+ else if (s.size() == 4 && s[3] == '0')
+ s = "Etc/UTC";
+
+ // This will fail unless TZ contains an IANA time zone name,
+ // or one of the special cases above.
+ if (auto tz = do_locate_zone(this->zones, this->links, s))
+ return tz;
+ }
+#endif
__throw_runtime_error("tzdb: cannot determine current zone");
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-01-14 21:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-14 21:59 [gcc r13-5170] libstdc++: Implement std::chrono::current_zone() for AIX [PR108409] Jonathan Wakely
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).