Author: hans Date: Wed Jul 26 11:30:42 2017 New Revision: 309150 URL: http://llvm.org/viewvc/llvm-project?rev=309150&view=rev Log: 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 ------------------------------------------------------------------------ Modified: libunwind/branches/release_50/ (props changed) libunwind/branches/release_50/test/CMakeLists.txt libunwind/branches/release_50/test/lit.site.cfg.in Propchange: libunwind/branches/release_50/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 26 11:30:42 2017 @@ -1 +1 @@ -/libunwind/trunk:308871 +/libunwind/trunk:308871,309147 Modified: libunwind/branches/release_50/test/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/libunwind/branches/release_50/test/CMakeLists.txt?rev=309150&r1=309149&r2=309150&view=diff ============================================================================== --- libunwind/branches/release_50/test/CMakeLists.txt (original) +++ libunwind/branches/release_50/test/CMakeLists.txt Wed Jul 26 11:30:42 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/branches/release_50/test/lit.site.cfg.in URL: http://llvm.org/viewvc/llvm-project/libunwind/branches/release_50/test/lit.site.cfg.in?rev=309150&r1=309149&r2=309150&view=diff ============================================================================== --- libunwind/branches/release_50/test/lit.site.cfg.in (original) +++ libunwind/branches/release_50/test/lit.site.cfg.in Wed Jul 26 11:30:42 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
