6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-13 22:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Get the unittests compiling when building with cmake and the setting

Browse Source 
-DLLVM_ENABLE_THREADS=false.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@181788 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan Sands
2013-05-14 13:29:16 +00:00
parent 15cf700b41
commit 8305acb200
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
unittests/Support/ManagedStatic.cpp
View File

@ -19,7 +19,8 @@ using namespace llvm;
namespace { 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 { namespace test1 {
llvm::ManagedStatic<int> ms; llvm::ManagedStatic<int> ms;
void *helper(void*) { void *helper(void*) {

4
utils/unittest/CMakeLists.txt
View File

@ -27,6 +27,10 @@ endif()
set(LLVM_REQUIRES_RTTI 1) set(LLVM_REQUIRES_RTTI 1)
add_definitions( -DGTEST_HAS_RTTI=0 ) add_definitions( -DGTEST_HAS_RTTI=0 )
if (NOT LLVM_ENABLE_THREADS)
add_definitions( -DGTEST_HAS_PTHREAD=0 )
endif()
# Visual Studio 2012 only supports up to 8 template parameters in # Visual Studio 2012 only supports up to 8 template parameters in
# std::tr1::tuple by default, but gtest requires 10 # std::tr1::tuple by default, but gtest requires 10
if(MSVC AND MSVC_VERSION EQUAL 1700) if(MSVC AND MSVC_VERSION EQUAL 1700)