diff options
| author | Don Hinton <hintonda@gmail.com> | 2017-12-07 22:55:40 +0000 |
|---|---|---|
| committer | Don Hinton <hintonda@gmail.com> | 2017-12-07 22:55:40 +0000 |
| commit | 25e64a1b1541f323e4583566d0050bacf50662a2 (patch) | |
| tree | 26712af700117e96cc1768f2678029a58a958617 | |
| parent | c776a9f5a83864b9a8102221f2914ad53b6c1ff7 (diff) | |
| download | bcm5719-llvm-25e64a1b1541f323e4583566d0050bacf50662a2.tar.gz bcm5719-llvm-25e64a1b1541f323e4583566d0050bacf50662a2.zip | |
[dump] Make LLVM_ENABLE_DUMP independent, and move to llvm-config.h
Summary: Make LLVM_ENABLE_DUMP independent LLVM_ENABLE_ASSERTIONS,
move it to llvm-config.h, and update description.
Differential Revision: https://reviews.llvm.org/D38406
llvm-svn: 320111
| -rw-r--r-- | llvm/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | llvm/include/llvm/Config/config.h.cmake | 3 | ||||
| -rw-r--r-- | llvm/include/llvm/Config/llvm-config.h.cmake | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 46d5282d8a7..a6b9141f061 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -385,7 +385,7 @@ option(LLVM_ENABLE_LLD "Use lld as C and C++ linker." OFF) option(LLVM_ENABLE_PEDANTIC "Compile with pedantic enabled." ON) option(LLVM_ENABLE_WERROR "Fail and stop if a warning is triggered." OFF) -option(LLVM_ENABLE_DUMP "Enable dump functions in release builds" OFF) +option(LLVM_ENABLE_DUMP "Enable dump functions even when assertions are disabled" OFF) if( NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG" ) option(LLVM_ENABLE_ASSERTIONS "Enable assertions" OFF) @@ -393,10 +393,6 @@ else() option(LLVM_ENABLE_ASSERTIONS "Enable assertions" ON) endif() -if( LLVM_ENABLE_ASSERTIONS ) - set(LLVM_ENABLE_DUMP ON) -endif() - option(LLVM_ENABLE_EXPENSIVE_CHECKS "Enable expensive checks" OFF) set(LLVM_ABI_BREAKING_CHECKS "WITH_ASSERTS" CACHE STRING diff --git a/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake index 038f70a79f9..940f8420304 100644 --- a/llvm/include/llvm/Config/config.h.cmake +++ b/llvm/include/llvm/Config/config.h.cmake @@ -359,9 +359,6 @@ /* Has gcc/MSVC atomic intrinsics */ #cmakedefine01 LLVM_HAS_ATOMICS -/* Define if LLVM_ENABLE_DUMP is enabled */ -#cmakedefine LLVM_ENABLE_DUMP - /* Host triple LLVM will be executed on */ #cmakedefine LLVM_HOST_TRIPLE "${LLVM_HOST_TRIPLE}" diff --git a/llvm/include/llvm/Config/llvm-config.h.cmake b/llvm/include/llvm/Config/llvm-config.h.cmake index 4b0c5946061..4daa00f3bc4 100644 --- a/llvm/include/llvm/Config/llvm-config.h.cmake +++ b/llvm/include/llvm/Config/llvm-config.h.cmake @@ -14,6 +14,9 @@ #ifndef LLVM_CONFIG_H #define LLVM_CONFIG_H +/* Define if LLVM_ENABLE_DUMP is enabled */ +#cmakedefine LLVM_ENABLE_DUMP + /* Define if we link Polly to the tools */ #cmakedefine LINK_POLLY_INTO_TOOLS |
