summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Roelofs <jonathan@codesourcery.com>2017-07-26 18:13:57 +0000
committerJonathan Roelofs <jonathan@codesourcery.com>2017-07-26 18:13:57 +0000
commit2cfff07a42a42f2ed7ed81334a11d4aa20259ab9 (patch)
tree13ff786a7a61dc0ee06dc29b93833ec77ce641a1
parentc271dea0a7924b6c284ec0bf944fc1f020e5866f (diff)
downloadbcm5719-llvm-2cfff07a42a42f2ed7ed81334a11d4aa20259ab9.tar.gz
bcm5719-llvm-2cfff07a42a42f2ed7ed81334a11d4aa20259ab9.zip
Partial fix for PR33858
https://reviews.llvm.org/D35848 llvm-svn: 309147
-rw-r--r--libunwind/test/CMakeLists.txt1
-rw-r--r--libunwind/test/lit.site.cfg.in2
2 files changed, 1 insertions, 2 deletions
diff --git a/libunwind/test/CMakeLists.txt b/libunwind/test/CMakeLists.txt
index 9673ed7c646..97917b820a3 100644
--- a/libunwind/test/CMakeLists.txt
+++ b/libunwind/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/libunwind/test/lit.site.cfg.in b/libunwind/test/lit.site.cfg.in
index d701a65dfed..3ed0c74bc71 100644
--- a/libunwind/test/lit.site.cfg.in
+++ b/libunwind/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@"
OpenPOWER on IntegriCloud