diff options
| author | Hans Wennborg <hans@hanshq.net> | 2017-07-26 18:30:42 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2017-07-26 18:30:42 +0000 |
| commit | 08a9d8430b8096d8963e9bc9c2a05f32816dd8a0 (patch) | |
| tree | d8296cdbd0dae708d1a23f6e1982cf59e599b614 | |
| parent | 1ca29a43cbf8e4102edf9221a69a4b90f9b6da09 (diff) | |
Merging r309147:linaro-local/diana.picus/RC2-ish
------------------------------------------------------------------------
r309147 | jroelofs | 2017-07-26 11:13:57 -0700 (Wed, 26 Jul 2017) | 4 lines
Partial fix for PR33858
https://reviews.llvm.org/D35848
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/libunwind/branches/release_50@309150 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | test/lit.site.cfg.in | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 9673ed7..97917b8 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -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.") diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in index d701a65..3ed0c74 100644 --- a/test/lit.site.cfg.in +++ b/test/lit.site.cfg.in @@ -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@" |