[llvm] r276307 - [llvm-config][GlobalISel] Canonicalize LLVM_HAS_GLOBAL_ISEL on ON/OFF.

Quentin Colombet via llvm-commits llvm-commits at lists.llvm.org
Thu Jul 21 10:26:47 PDT 2016


Author: qcolombet
Date: Thu Jul 21 12:26:47 2016
New Revision: 276307

URL: http://llvm.org/viewvc/llvm-project?rev=276307&view=rev
Log:
[llvm-config][GlobalISel] Canonicalize LLVM_HAS_GLOBAL_ISEL on ON/OFF.

Previously LLVM_HAS_GLOBAL_ISEL would directly get the value of
LLVM_BUILD_GLOBAL_ISEL. This could be any integer value and not just ON
and OFF. The problem is that lit.cfg was checking for ON to define that
global-isel was supported, thus if we were setting
LLVM_BUILD_GLOBAL_ISEL with an integer value, say 1, this test would
fail whereas we do build global-isel and want to test it.

Modified:
    llvm/trunk/tools/llvm-config/CMakeLists.txt

Modified: llvm/trunk/tools/llvm-config/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/CMakeLists.txt?rev=276307&r1=276306&r2=276307&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-config/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-config/CMakeLists.txt Thu Jul 21 12:26:47 2016
@@ -37,7 +37,11 @@ set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${
 set(LLVM_BUILD_SYSTEM cmake)
 set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI})
 set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}${LLVM_VERSION_SUFFIX}")
-set(LLVM_HAS_GLOBAL_ISEL "${LLVM_BUILD_GLOBAL_ISEL}")
+if(LLVM_BUILD_GLOBAL_ISEL)
+  set(LLVM_HAS_GLOBAL_ISEL "ON")
+else()
+  set(LLVM_HAS_GLOBAL_ISEL "OFF")
+endif()
 
 # Use the C++ link flags, since they should be a superset of C link flags.
 set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}")




More information about the llvm-commits mailing list