LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[libcxx] Improve the gcc workaround for the missing __has_include macro.

Browse Source 
NFC.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@284237 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Asiri Rathnayake
2016-10-14 13:56:58 +00:00
parent 7250d3341e
commit 4f2c83f055
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/__threading_support
View File

@@ -19,20 +19,18 @@
#ifndef _LIBCPP_HAS_NO_THREADS #ifndef _LIBCPP_HAS_NO_THREADS
// These checks are carefully arranged so as not to trigger a gcc pre-processor #ifndef __libcpp_has_include
// defect which causes it to fail to parse the __has_include check below, the #ifndef __has_include
// redundancy is intentional. #define __libcpp_has_include(x) 0
#if defined(_LIBCPP_HAS_THREAD_API_EXTERNAL) #else
#if !defined(__clang__) && (_GNUC_VER < 500) #define __libcpp_has_include(x) __has_include(x)
#include <__external_threading> #endif
#define _LIBCPP_HAS_EXTERNAL_THREADING_HEADER
#elif !defined(__has_include) || __has_include(<__external_threading>)
#include <__external_threading>
#define _LIBCPP_HAS_EXTERNAL_THREADING_HEADER
#endif
#endif #endif
#if !defined(_LIBCPP_HAS_EXTERNAL_THREADING_HEADER) #if defined(_LIBCPP_HAS_THREAD_API_EXTERNAL) && \
__libcpp_has_include(<__external_threading>)
#include <__external_threading>
#else
#include <pthread.h> #include <pthread.h>
#include <sched.h> #include <sched.h>
@@ -241,7 +239,7 @@ void __libcpp_tls_set(__libcpp_tls_key __key, void* __p)
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#endif // !_LIBCPP_HAS_EXTERNAL_THREADING_HEADER #endif // !_LIBCPP_HAS_THREAD_API_EXTERNAL || !__libcpp_has_include(<__external_threading>)
#endif // _LIBCPP_HAS_NO_THREADS #endif // _LIBCPP_HAS_NO_THREADS