This is an archive of the discontinued LLVM Phabricator instance.

Differential D42503

libcxx: Unbreak external thread library configuration.
ClosedPublic

Authored by pcc on Jan 24 2018, 1:51 PM.

Details

Reviewers
mclow.lists
EricWF
Commits
rG2a129dc31bad: libcxx: Unbreak external thread library configuration.
rCXX325723: libcxx: Unbreak external thread library configuration.
rL325723: libcxx: Unbreak external thread library configuration.

Diff Detail

Repository
rCXX libc++

Event Timeline

pcc created this revision.Jan 24 2018, 1:51 PM
Harbormaster completed remote builds in B14214: Diff 131344.Jan 24 2018, 1:51 PM
pcc mentioned this in D42214: libcxx: Move Windows threading support into a .cpp file..Jan 24 2018, 1:52 PM
eastig added a comment.Jan 31 2018, 2:06 PM

Ping

eastig added a comment.Feb 8 2018, 1:42 PM

Ping

EricWF accepted this revision.Feb 9 2018, 6:32 PM

LGTM.

This revision is now accepted and ready to land.Feb 9 2018, 6:32 PM
eastig added a comment.Feb 21 2018, 1:28 PM

Hi Peter,

Could you please commit the patch?

Thank,
Evgeny

Herald added a subscriber: christof. · View Herald TranscriptFeb 21 2018, 1:28 PM
Closed by commit rL325723: libcxx: Unbreak external thread library configuration. (authored by pcc). · Explain WhyFeb 21 2018, 1:39 PM
Closed by commit rCXX325723: libcxx: Unbreak external thread library configuration. (authored by pcc). · Explain Why
This revision was automatically updated to reflect the committed changes.
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: cfe-commits. · View Herald TranscriptFeb 21 2018, 1:39 PM
eastig added a comment.Feb 21 2018, 2:03 PM

Just validated that it has fixed the issue.
Thank you, Peter.

Revision Contents

PathSize
include/
21 lines

Diff 135324

include/__threading_support

Show All 25 Lines
#if defined(_LIBCPP_HAS_THREAD_API_PTHREAD) #if defined(_LIBCPP_HAS_THREAD_API_PTHREAD)
# include <pthread.h> # include <pthread.h>
# include <sched.h> # include <sched.h>
#endif #endif
_LIBCPP_PUSH_MACROS _LIBCPP_PUSH_MACROS
#include <__undef_macros> #include <__undef_macros>
#if defined(_LIBCPP_HAS_THREAD_LIBRARY_EXTERNAL) || \
defined(_LIBCPP_BUILDING_THREAD_LIBRARY_EXTERNAL) || \
defined(_LIBCPP_HAS_THREAD_API_WIN32)
#define _LIBCPP_THREAD_ABI_VISIBILITY _LIBCPP_FUNC_VIS
#else
#define _LIBCPP_THREAD_ABI_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
#endif
#if defined(__FreeBSD__) && defined(__clang__) && __has_attribute(no_thread_safety_analysis) #if defined(__FreeBSD__) && defined(__clang__) && __has_attribute(no_thread_safety_analysis)
#define _LIBCPP_NO_THREAD_SAFETY_ANALYSIS __attribute__((no_thread_safety_analysis)) #define _LIBCPP_NO_THREAD_SAFETY_ANALYSIS __attribute__((no_thread_safety_analysis))
#else #else
#define _LIBCPP_NO_THREAD_SAFETY_ANALYSIS #define _LIBCPP_NO_THREAD_SAFETY_ANALYSIS
#endif #endif
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if defined(_LIBCPP_HAS_THREAD_LIBRARY_EXTERNAL) || \ #if defined(_LIBCPP_HAS_THREAD_API_PTHREAD)
defined(_LIBCPP_BUILDING_THREAD_LIBRARY_EXTERNAL)
#define _LIBCPP_THREAD_ABI_VISIBILITY _LIBCPP_FUNC_VIS
#elif defined(_LIBCPP_HAS_THREAD_API_PTHREAD)
#define _LIBCPP_THREAD_ABI_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
// Mutex // Mutex
typedef pthread_mutex_t __libcpp_mutex_t; typedef pthread_mutex_t __libcpp_mutex_t;
#define _LIBCPP_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER #define _LIBCPP_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
typedef pthread_mutex_t __libcpp_recursive_mutex_t; typedef pthread_mutex_t __libcpp_recursive_mutex_t;
// Condition Variable // Condition Variable
typedef pthread_cond_t __libcpp_condvar_t; typedef pthread_cond_t __libcpp_condvar_t;
Show All 11 Lines
typedef pthread_t __libcpp_thread_t; typedef pthread_t __libcpp_thread_t;
// Thrad Local Storage // Thrad Local Storage
typedef pthread_key_t __libcpp_tls_key; typedef pthread_key_t __libcpp_tls_key;
#define _LIBCPP_TLS_DESTRUCTOR_CC #define _LIBCPP_TLS_DESTRUCTOR_CC
#else #else
#define _LIBCPP_THREAD_ABI_VISIBILITY _LIBCPP_FUNC_VIS
// Mutex // Mutex
typedef void* __libcpp_mutex_t; typedef void* __libcpp_mutex_t;
#define _LIBCPP_MUTEX_INITIALIZER 0 #define _LIBCPP_MUTEX_INITIALIZER 0
#if defined(_M_IX86) || defined(__i386__) || defined(_M_ARM) || defined(__arm__) #if defined(_M_IX86) || defined(__i386__) || defined(_M_ARM) || defined(__arm__)
typedef void* __libcpp_recursive_mutex_t[6]; typedef void* __libcpp_recursive_mutex_t[6];
#elif defined(_M_AMD64) || defined(__x86_64__) || defined(_M_ARM64) || defined(__aarch64__) #elif defined(_M_AMD64) || defined(__x86_64__) || defined(_M_ARM64) || defined(__aarch64__)
typedef void* __libcpp_recursive_mutex_t[5]; typedef void* __libcpp_recursive_mutex_t[5];
▲ Show 20 Lines • Show All 317 Lines • Show Last 20 Lines