summaryrefslogtreecommitdiffstats
path: root/libcxx/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
commit5d1a701d6def1e4e6ae3d5bce67efd40b07fba16 (patch)
treef24f148cd0e121eac7f27d1423983ac369ea1bb3 /libcxx/src
parenta8c7c154bb820e21a141602297514b5849607148 (diff)
downloadbcm5719-llvm-5d1a701d6def1e4e6ae3d5bce67efd40b07fba16.tar.gz
bcm5719-llvm-5d1a701d6def1e4e6ae3d5bce67efd40b07fba16.zip
Xing Xue: port to IBM XLC++/AIX.
llvm-svn: 188396
Diffstat (limited to 'libcxx/src')
-rw-r--r--libcxx/src/locale.cpp2
-rw-r--r--libcxx/src/thread.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp
index d95d0c9c954..ac1952151a0 100644
--- a/libcxx/src/locale.cpp
+++ b/libcxx/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/libcxx/src/thread.cpp b/libcxx/src/thread.cpp
index 1fd8bb047c8..cdfa2fd9273 100644
--- a/libcxx/src/thread.cpp
+++ b/libcxx/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
OpenPOWER on IntegriCloud