diff options
| -rw-r--r-- | libcxx/include/__config | 1 | ||||
| -rw-r--r-- | libcxx/include/__support/ibm/xlocale.h | 34 | ||||
| -rw-r--r-- | libcxx/src/filesystem/filesystem_common.h | 9 | ||||
| -rw-r--r-- | libcxxabi/src/CMakeLists.txt | 3 |
4 files changed, 46 insertions, 1 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config index f4dce07..cd748fd 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -1145,6 +1145,7 @@ extern "C" _LIBCPP_FUNC_VIS void __sanitizer_annotate_contiguous_container( defined(__CloudABI__) || \ defined(__sun__) || \ defined(__MVS__) || \ + defined(_AIX) || \ (defined(__MINGW32__) && __has_include(<pthread.h>)) # define _LIBCPP_HAS_THREAD_API_PTHREAD # elif defined(__Fuchsia__) diff --git a/libcxx/include/__support/ibm/xlocale.h b/libcxx/include/__support/ibm/xlocale.h index 563b465..ff14d2e 100644 --- a/libcxx/include/__support/ibm/xlocale.h +++ b/libcxx/include/__support/ibm/xlocale.h @@ -212,11 +212,13 @@ size_t wcsxfrm_l(wchar_t *__ws1, const wchar_t *__ws2, size_t __n, // strftime_l() is defined by POSIX. However, AIX 7.1 and z/OS do not have it // implemented yet. z/OS retrieves it from the POSIX fallbacks. +#if !defined(_AIX72) static inline size_t strftime_l(char *__s, size_t __size, const char *__fmt, const struct tm *__tm, locale_t locale) { return __xstrftime(locale, __s, __size, __fmt, __tm); } +#endif #elif defined(__MVS__) #include <wctype.h> @@ -224,47 +226,79 @@ size_t strftime_l(char *__s, size_t __size, const char *__fmt, #include <__support/xlocale/__posix_l_fallback.h> #endif // defined(__MVS__) +namespace { + +struct __setAndRestore { + explicit __setAndRestore(locale_t locale) { + if (locale == (locale_t)0) { + __cloc = newlocale(LC_ALL_MASK, "C", /* base */ (locale_t)0); + __stored = uselocale(__cloc); + } else { + __stored = uselocale(locale); + } + } + + ~__setAndRestore() { + uselocale(__stored); + if (__cloc) + freelocale(__cloc); + } + +private: + locale_t __stored = (locale_t)0; + locale_t __cloc = (locale_t)0; +}; + +} // namespace + // The following are not POSIX routines. These are quick-and-dirty hacks // to make things pretend to work static inline long long strtoll_l(const char *__nptr, char **__endptr, int __base, locale_t locale) { + __setAndRestore __newloc(locale); return strtoll(__nptr, __endptr, __base); } static inline long strtol_l(const char *__nptr, char **__endptr, int __base, locale_t locale) { + __setAndRestore __newloc(locale); return strtol(__nptr, __endptr, __base); } static inline double strtod_l(const char *__nptr, char **__endptr, locale_t locale) { + __setAndRestore __newloc(locale); return strtod(__nptr, __endptr); } static inline float strtof_l(const char *__nptr, char **__endptr, locale_t locale) { + __setAndRestore __newloc(locale); return strtof(__nptr, __endptr); } static inline long double strtold_l(const char *__nptr, char **__endptr, locale_t locale) { + __setAndRestore __newloc(locale); return strtold(__nptr, __endptr); } static inline unsigned long long strtoull_l(const char *__nptr, char **__endptr, int __base, locale_t locale) { + __setAndRestore __newloc(locale); return strtoull(__nptr, __endptr, __base); } static inline unsigned long strtoul_l(const char *__nptr, char **__endptr, int __base, locale_t locale) { + __setAndRestore __newloc(locale); return strtoul(__nptr, __endptr, __base); } diff --git a/libcxx/src/filesystem/filesystem_common.h b/libcxx/src/filesystem/filesystem_common.h index c2214d0..f7f9013 100644 --- a/libcxx/src/filesystem/filesystem_common.h +++ b/libcxx/src/filesystem/filesystem_common.h @@ -467,6 +467,15 @@ inline TimeSpec extract_atime(StatT const& st) { TimeSpec TS = {st.st_atime, 0}; return TS; } +#elif defined(_AIX) +inline TimeSpec extract_mtime(StatT const& st) { + TimeSpec TS = {st.st_mtime, st.st_mtime_n}; + return TS; +} +inline TimeSpec extract_atime(StatT const& st) { + TimeSpec TS = {st.st_atime, st.st_atime_n}; + return TS; +} #else inline TimeSpec extract_mtime(StatT const& st) { return st.st_mtim; } inline TimeSpec extract_atime(StatT const& st) { return st.st_atim; } diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt index a2945f0..32a998e 100644 --- a/libcxxabi/src/CMakeLists.txt +++ b/libcxxabi/src/CMakeLists.txt @@ -36,7 +36,8 @@ else() ) endif() -if (LIBCXXABI_ENABLE_THREADS AND (UNIX OR FUCHSIA) AND NOT (APPLE OR CYGWIN)) +if (LIBCXXABI_ENABLE_THREADS AND (UNIX OR FUCHSIA) AND NOT (APPLE OR CYGWIN) + AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "AIX")) list(APPEND LIBCXXABI_SOURCES cxa_thread_atexit.cpp ) |