Skip to content

Commit

Permalink
libc++: support NaCl when building thread.cpp
Browse files Browse the repository at this point in the history
Summary: NaCl shouldn't include sysctl.h when trying to determine std::thread::hardware_concurrency, it should instead use sysconf(_SC_NPROCESSORS_ONLN) through unistd.h. No test needs to be changed, since hardware_concurrency.pass.cpp already tests that std::thread::hardware_concurrency > 0.

Test Plan: make check-libcxx

Reviewers: dschuff, danalbert

Subscribers: jfb, cfe-commits

Differential Revision: http://reviews.llvm.org/D6470

llvm-svn: 223128
  • Loading branch information
jfbastien committed Dec 2, 2014
1 parent 57f033a commit b1ba015
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions libcxx/src/thread.cpp
Expand Up @@ -17,10 +17,10 @@
#include "limits"
#include <sys/types.h>
#if !defined(_WIN32)
#if !defined(__sun__) && !defined(__linux__) && !defined(_AIX)
#include <sys/sysctl.h>
#endif // !__sun__ && !__linux__ && !_AIX
#include <unistd.h>
# if !defined(__sun__) && !defined(__linux__) && !defined(_AIX) && !defined(__native_client__)
# include <sys/sysctl.h>
# endif // !defined(__sun__) && !defined(__linux__) && !defined(_AIX) && !defined(__native_client__)
# include <unistd.h>
#endif // !_WIN32

#if defined(__NetBSD__)
Expand Down

0 comments on commit b1ba015

Please sign in to comment.