[llvm] f128f44 - [CMake] Fix setting result of libatomic check for MSVC

Luís Marques via llvm-commits llvm-commits at lists.llvm.org
Mon Feb 17 07:32:45 PST 2020


Author: Luís Marques
Date: 2020-02-17T15:32:28Z
New Revision: f128f442a3d23674bee19ae18e29f92c9dfe40cd

URL: https://github.com/llvm/llvm-project/commit/f128f442a3d23674bee19ae18e29f92c9dfe40cd
DIFF: https://github.com/llvm/llvm-project/commit/f128f442a3d23674bee19ae18e29f92c9dfe40cd.diff

LOG: [CMake] Fix setting result of libatomic check for MSVC

We were skipping the libatomic requirement check for MSVC, but not setting
the corresponding variable, HAVE_CXX_ATOMICS_WITHOUT_LIB. D69869 seems to
have to failed to build on ARM MSVC because of that, and was reverted. This
should probably fix the issue. The plan is to check the result of the build
bots and then submit a more thoroughly refactored version for review.

Added: 
    

Modified: 
    llvm/cmake/modules/CheckAtomic.cmake

Removed: 
    


################################################################################
diff  --git a/llvm/cmake/modules/CheckAtomic.cmake b/llvm/cmake/modules/CheckAtomic.cmake
index 29f3bdd57f03..af925f5bf9ec 100644
--- a/llvm/cmake/modules/CheckAtomic.cmake
+++ b/llvm/cmake/modules/CheckAtomic.cmake
@@ -53,6 +53,8 @@ if (LLVM_COMPILER_IS_GCC_COMPATIBLE)
       message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.")
     endif()
   endif()
+elseif(MSVC)
+  set(HAVE_CXX_ATOMICS_WITHOUT_LIB True)
 endif()
 
 # Check for 64 bit atomic operations.


        


More information about the llvm-commits mailing list