This is an archive of the discontinued LLVM Phabricator instance.

libc++: support NaCl when building thread.cpp
ClosedPublic

Authored by jfb on Dec 1 2014, 5:24 PM.

Download Raw Diff

Details

Reviewers

dschuff
danalbert

Commits

rGb1ba015b9f9e: libc++: support NaCl when building thread.cpp
rCXX223128: libc++: support NaCl when building thread.cpp
rL223128: libc++: support NaCl when building thread.cpp

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.

Diff Detail

Event Timeline

jfb updated this revision to Diff 16793.Dec 1 2014, 5:24 PM

jfb retitled this revision from to libc++: support NaCl when building thread.cpp.

jfb updated this object.

jfb edited the test plan for this revision. (Show Details)

jfb added reviewers: dschuff, danalbert.

jfb added a subscriber: Unknown Object (MLST).

Herald added a subscriber: jfb. · View Herald TranscriptDec 1 2014, 5:24 PM

LGTM

This revision is now accepted and ready to land.Dec 2 2014, 9:30 AM

Closed by commit rL223128 (authored by @jfb).

Revision Contents

Path

Size

src/

thread.cpp

8 lines

Diff 16793

src/thread.cpp

	Show All 11 Lines

	#include "thread"			#include "thread"
	#include "exception"			#include "exception"
	#include "vector"			#include "vector"
	#include "future"			#include "future"
	#include "limits"			#include "limits"
	#include <sys/types.h>			#include <sys/types.h>
	#if !defined(_WIN32)			#if !defined(_WIN32)
	#if !defined(__sun__) && !defined(__linux__) && !defined(_AIX)			# if !defined(__sun__) && !defined(__linux__) && !defined(_AIX) && !defined(__native_client__)
	#include <sys/sysctl.h>			# include <sys/sysctl.h>
	#endif // !__sun__ && !__linux__ && !_AIX			# endif // !defined(__sun__) && !defined(__linux__) && !defined(_AIX) && !defined(__native_client__)
	#include <unistd.h>			# include <unistd.h>
	#endif // !_WIN32			#endif // !_WIN32

	#if defined(__NetBSD__)			#if defined(__NetBSD__)
	#pragma weak pthread_create // Do not create libpthread dependency			#pragma weak pthread_create // Do not create libpthread dependency
	#endif			#endif
	#if defined(_WIN32)			#if defined(_WIN32)
	#include <windows.h>			#include <windows.h>
	#endif			#endif
	▲ Show 20 Lines • Show All 201 Lines • Show Last 20 Lines