summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2013-08-14 18:00:20 +0000
committerHoward Hinnant <hhinnant@apple.com>2013-08-14 18:00:20 +0000
commit7f76450ee9f14ed646a38f43a09dc49dde413281 (patch)
tree289ec251e6285f6c2afa93d7f6d2e0ce401350d8 /src
parent3e005bf6b2649da693d6c3109b5947890a0ffec3 (diff)
downloadexternal_libcxx-7f76450ee9f14ed646a38f43a09dc49dde413281.tar.gz
external_libcxx-7f76450ee9f14ed646a38f43a09dc49dde413281.tar.bz2
external_libcxx-7f76450ee9f14ed646a38f43a09dc49dde413281.zip
Xing Xue: port to IBM XLC++/AIX.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@188396 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'src')
-rw-r--r--src/locale.cpp2
-rw-r--r--src/thread.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/locale.cpp b/src/locale.cpp
index d95d0c9c9..ac1952151 100644
--- a/src/locale.cpp
+++ b/src/locale.cpp
@@ -1015,6 +1015,8 @@ ctype<char>::classic_table() _NOEXCEPT
// going to end up dereferencing it later...
#elif defined(EMSCRIPTEN)
return *__ctype_b_loc();
+#elif defined(_AIX)
+ return (const unsigned long *)__lc_ctype_ptr->obj->mask;
#else
// Platform not supported: abort so the person doing the port knows what to
// fix
diff --git a/src/thread.cpp b/src/thread.cpp
index 1fd8bb047..cdfa2fd92 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -14,9 +14,9 @@
#include "limits"
#include <sys/types.h>
#if !defined(_WIN32)
-#if !defined(__sun__) && !defined(__linux__)
+#if !defined(__sun__) && !defined(__linux__) && !defined(_AIX)
#include <sys/sysctl.h>
-#endif // !__sun__ && !__linux__
+#endif // !__sun__ && !__linux__ && !_AIX
#include <unistd.h>
#endif // !_WIN32