Merged to 5.0 in r309150.
On Wed, Jul 26, 2017 at 11:13 AM, Jonathan Roelofs via cfe-commits <cfe-commits@lists.llvm.org> wrote: > Author: jroelofs > Date: Wed Jul 26 11:13:57 2017 > New Revision: 309147 > > URL: http://llvm.org/viewvc/llvm-project?rev=309147&view=rev > Log: > Partial fix for PR33858 > > https://reviews.llvm.org/D35848 > > Modified: > libunwind/trunk/test/CMakeLists.txt > libunwind/trunk/test/lit.site.cfg.in > > Modified: libunwind/trunk/test/CMakeLists.txt > URL: > http://llvm.org/viewvc/llvm-project/libunwind/trunk/test/CMakeLists.txt?rev=309147&r1=309146&r2=309147&view=diff > ============================================================================== > --- libunwind/trunk/test/CMakeLists.txt (original) > +++ libunwind/trunk/test/CMakeLists.txt Wed Jul 26 11:13:57 2017 > @@ -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.") > > Modified: libunwind/trunk/test/lit.site.cfg.in > URL: > http://llvm.org/viewvc/llvm-project/libunwind/trunk/test/lit.site.cfg.in?rev=309147&r1=309146&r2=309147&view=diff > ============================================================================== > --- libunwind/trunk/test/lit.site.cfg.in (original) > +++ libunwind/trunk/test/lit.site.cfg.in Wed Jul 26 11:13:57 2017 > @@ -7,7 +7,7 @@ config.abi_library_path = "@LIBU > 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@" > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
