diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-05-15 21:43:59 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-05-15 21:43:59 +0200 |
| commit | b2e3c7da703d4c3dda41d4f1e18cd976e6c4381a (patch) | |
| tree | 7462cd2988228ae24c40b37a9382d35874bbf099 /unittests/Support/ManagedStatic.cpp | |
| parent | 23d8d191eff180ba312a4d1b4fec8597e5a988d5 (diff) | |
| parent | 4ef61f2ad4ff509ee05c7051d359009511f81226 (diff) | |
| download | llvm-b2e3c7da703d4c3dda41d4f1e18cd976e6c4381a.tar.gz llvm-b2e3c7da703d4c3dda41d4f1e18cd976e6c4381a.tar.bz2 llvm-b2e3c7da703d4c3dda41d4f1e18cd976e6c4381a.tar.xz | |
Merge branch 'master' into embtk-support-masterembtk-support-master
Diffstat (limited to 'unittests/Support/ManagedStatic.cpp')
| -rw-r--r-- | unittests/Support/ManagedStatic.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/unittests/Support/ManagedStatic.cpp b/unittests/Support/ManagedStatic.cpp index 8ddad38ecf..1497f4e340 100644 --- a/unittests/Support/ManagedStatic.cpp +++ b/unittests/Support/ManagedStatic.cpp @@ -19,7 +19,8 @@ using namespace llvm; namespace { -#if defined(HAVE_PTHREAD_H) && !__has_feature(memory_sanitizer) +#if LLVM_ENABLE_THREADS != 0 && defined(HAVE_PTHREAD_H) && \ + !__has_feature(memory_sanitizer) namespace test1 { llvm::ManagedStatic<int> ms; void *helper(void*) { |