diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2023-01-14 20:13:32 +0000 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2023-01-14 20:49:45 +0000 |
commit | d80e5a7b30e5d045c808f5235123e366e4e9286c (patch) | |
tree | 06cc1c9a60045b273c158fda1488237ba361930a | |
parent | c47dcb95666ce0b48f0ff09aa99483fd12df8714 (diff) | |
download | gcc-d80e5a7b30e5d045c808f5235123e366e4e9286c.zip gcc-d80e5a7b30e5d045c808f5235123e366e4e9286c.tar.gz gcc-d80e5a7b30e5d045c808f5235123e366e4e9286c.tar.bz2 |
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.
-rw-r--r-- | libstdc++-v3/src/c++20/tzdb.cc | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/libstdc++-v3/src/c++20/tzdb.cc b/libstdc++-v3/src/c++20/tzdb.cc index a37859d..eaaea36 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"); } |