Author: compnerd
Date: Mon Apr 27 13:19:33 2015
New Revision: 235904

URL: http://llvm.org/viewvc/llvm-project?rev=235904&view=rev
Log:
libc++abi: enable LLVM unwinder by default for ARM

libc++abi uses EHABI extensions, which are only part of the LLVM unwinder.  When
targeting ARM by default, enable the use of the LLVM unwinder.  Hopefully this
will fix the ARM native bot

Modified:
    libcxxabi/trunk/CMakeLists.txt

Modified: libcxxabi/trunk/CMakeLists.txt
URL: 
http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/CMakeLists.txt?rev=235904&r1=235903&r2=235904&view=diff
==============================================================================
--- libcxxabi/trunk/CMakeLists.txt (original)
+++ libcxxabi/trunk/CMakeLists.txt Mon Apr 27 13:19:33 2015
@@ -114,7 +114,12 @@ endif()
 option(LIBCXXABI_ENABLE_ASSERTIONS "Enable assertions independent of build 
mode." ON)
 option(LIBCXXABI_ENABLE_PEDANTIC "Compile with pedantic enabled." ON)
 option(LIBCXXABI_ENABLE_WERROR "Fail and stop if a warning is triggered." OFF)
-option(LIBCXXABI_USE_LLVM_UNWINDER "Build and use the LLVM unwinder." OFF)
+set(LIBCXXABI_USE_LLVM_UNWINDER_DEFAULT OFF)
+if (${LLVM_NATIVE_ARCH} MATCHES arm)
+  set(LIBCXXABI_USE_LLVM_UNWINDER_DEFAULT ON)
+endif ()
+option(LIBCXXABI_USE_LLVM_UNWINDER "Build and use the LLVM unwinder."
+       ${LIBCXXABI_USE_LLVM_UNWINDER_DEFAULT})
 option(LIBCXXABI_ENABLE_THREADS "Build with threads enabled" ON)
 set(LIBCXXABI_GCC_TOOLCHAIN "" CACHE STRING "GCC toolchain for cross 
compiling.")
 set(LIBCXXABI_SYSROOT "" CACHE STRING "Sysroot for cross compiling.")


_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits

Reply via email to