Commit 91174ebd authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r309147: 

------------------------------------------------------------------------
r309147 | jroelofs | 2017-07-26 11:13:57 -0700 (Wed, 26 Jul 2017) | 4 lines

Partial fix for PR33858

https://reviews.llvm.org/D35848

------------------------------------------------------------------------

llvm-svn: 309150
parent c68cac09

libunwind/test/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ pythonize_bool(LIBCXX_ENABLE_SHARED) 
pythonize_bool(LIBUNWIND_ENABLE_SHARED)

pythonize_bool(LIBUNWIND_ENABLE_THREADS)

pythonize_bool(LIBUNWIND_ENABLE_EXCEPTIONS)

pythonize_bool(LIBUNWIND_USE_LLVM_UNWINDER)

pythonize_bool(LIBUNWIND_BUILD_EXTERNAL_THREAD_LIBRARY)

set(LIBUNWIND_TARGET_INFO "libcxx.test.target_info.LocalTI" CACHE STRING

    "TargetInfo to use when setting up test environment.")

libunwind/test/lit.site.cfg.in

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ config.abi_library_path = "@LIBUNWIND_LIBRARY_DIR@" 
config.libcxx_src_root          = "@LIBUNWIND_LIBCXX_PATH@"

config.libunwind_headers        = "@LIBUNWIND_SOURCE_DIR@/include"

config.cxx_library_root         = "@LIBUNWIND_LIBCXX_LIBRARY_PATH@"

config.llvm_unwinder            = "@LIBUNWIND_USE_LLVM_UNWINDER@"

config.llvm_unwinder            = "1"

config.enable_threads           = "@LIBUNWIND_ENABLE_THREADS@"

config.use_sanitizer            = "@LLVM_USE_SANITIZER@"

config.enable_32bit             = "@LIBUNWIND_BUILD_32_BITS@"