replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix r260515 - Correct typos in CMake changes 

llvm-svn: 260524
This commit is contained in:
Eric Fiselier 2016-02-11 15:05:56 +00:00
parent 00f9d23f8e
commit 7603e0050e
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcxx/cmake/Modules/CheckLibcxxAtomic.cmake
View File

@ -25,11 +25,11 @@ int main() {
set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
endfunction(check_cxx_atomics)
check_cxx_atomics(LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB)
check_cxx_atomics(LIBCXX_HAVE_CXX_ATOMICS_WITHOUT_LIB)
# If not, check if the library exists, and atomics work with it.
if(NOT LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB)
check_library_exists(atomic __atomic_fetch_add_8 "" HAVE_LIBATOMIC)
if(HAVE_LIBATOMIC)
if(NOT LIBCXX_HAVE_CXX_ATOMICS_WITHOUT_LIB)
check_library_exists(atomic __atomic_fetch_add_8 "" LIBCXX_HAS_ATOMIC_LIB)
if(LIBCXX_HAS_ATOMIC_LIB)
list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
check_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB)
if (NOT HAVE_CXX_ATOMICS_WITH_LIB)

4
libcxx/cmake/config-ix.cmake
View File

@ -18,7 +18,3 @@ check_library_exists(c fopen "" LIBCXX_HAS_C_LIB)
check_library_exists(m ccos "" LIBCXX_HAS_M_LIB)
check_library_exists(rt clock_gettime "" LIBCXX_HAS_RT_LIB)
check_library_exists(gcc_s __gcc_personality_v0 "" LIBCXX_HAS_GCC_S_LIB)
if (NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
set(LIBCXX_HAS_ATOMIC_LIB True)
endif()