[llvm-commits] [llvm] r164817 - in /llvm/trunk: CMakeLists.txt include/llvm/Config/config.h.cmake lib/Support/Unix/Signals.inc

[Eric Christopher]

Oops. Thanks!

-eric

On Fri, Sep 28, 2012 at 3:10 AM, Benjamin Kramer
<benny.kra at googlemail.com> wrote:
> Author: d0k
> Date: Fri Sep 28 05:10:46 2012
> New Revision: 164817
>
> URL: http://llvm.org/viewvc/llvm-project?rev=164817&view=rev
> Log:
> Make backtraces work again with both the configure and cmake build.
>
> Modified:
>     llvm/trunk/CMakeLists.txt
>     llvm/trunk/include/llvm/Config/config.h.cmake
>     llvm/trunk/lib/Support/Unix/Signals.inc
>
> Modified: llvm/trunk/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=164817&r1=164816&r2=164817&view=diff
> ==============================================================================
> --- llvm/trunk/CMakeLists.txt (original)
> +++ llvm/trunk/CMakeLists.txt Fri Sep 28 05:10:46 2012
> @@ -115,6 +115,11 @@
>    set(ENABLE_TIMESTAMPS 1)
>  endif()
>
> +option(LLVM_ENABLE_BACKTRACES "Enable embedding backtraces on crash." ON)
> +if(LLVM_ENABLE_BACKTRACES)
> +  set(ENABLE_BACKTRACES 1)
> +endif()
> +
>  option(LLVM_ENABLE_FFI "Use libffi to call external functions from the interpreter" OFF)
>  set(FFI_LIBRARY_DIR "" CACHE PATH "Additional directory, where CMake should search for libffi.so")
>  set(FFI_INCLUDE_DIR "" CACHE PATH "Additional directory, where CMake should search for ffi.h or ffi/ffi.h")
>
> Modified: llvm/trunk/include/llvm/Config/config.h.cmake
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/config.h.cmake?rev=164817&r1=164816&r2=164817&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/Config/config.h.cmake (original)
> +++ llvm/trunk/include/llvm/Config/config.h.cmake Fri Sep 28 05:10:46 2012
> @@ -17,6 +17,9 @@
>  /* Default <path> to all compiler invocations for --sysroot=<path>. */
>  #undef DEFAULT_SYSROOT
>
> +/* Define if you want backtraces on crash */
> +#cmakedefine ENABLE_BACKTRACES
> +
>  /* Define if position independent code is enabled */
>  #cmakedefine ENABLE_PIC
>
>
> Modified: llvm/trunk/lib/Support/Unix/Signals.inc
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Unix/Signals.inc?rev=164817&r1=164816&r2=164817&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/Unix/Signals.inc (original)
> +++ llvm/trunk/lib/Support/Unix/Signals.inc Fri Sep 28 05:10:46 2012
> @@ -243,7 +243,7 @@
>  // On glibc systems we have the 'backtrace' function, which works nicely, but
>  // doesn't demangle symbols.
>  static void PrintStackTrace(void *) {
> -#if defined(HAVE_BACKTRACE) && defined(ENABLE_BACKTRACE)
> +#if defined(HAVE_BACKTRACE) && defined(ENABLE_BACKTRACES)
>    static void* StackTrace[256];
>    // Use backtrace() to output a backtrace on Linux systems with glibc.
>    int depth = backtrace(StackTrace,
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits