[PATCH] D43168: Don't use -ldl on BSD

[Dimitry Andric via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL324848: Use CMAKE_DL_LIBS and CMAKE_THREAD_LIBS_INIT for Bitcode tests (authored by dim, committed by ).

Repository:
  rL LLVM

https://reviews.llvm.org/D43168

Files:
  test-suite/trunk/Bitcode/Benchmarks/Halide/CMakeLists.txt
  test-suite/trunk/Bitcode/Regression/fft/CMakeLists.txt
  test-suite/trunk/Bitcode/Regression/vector_widen/CMakeLists.txt
  test-suite/trunk/Bitcode/simd_ops/CMakeLists.txt


Index: test-suite/trunk/Bitcode/Regression/fft/CMakeLists.txt
===================================================================
--- test-suite/trunk/Bitcode/Regression/fft/CMakeLists.txt
+++ test-suite/trunk/Bitcode/Regression/fft/CMakeLists.txt
@@ -3,7 +3,11 @@
 SET_SOURCE_FILES_PROPERTIES(${uosources} PROPERTIES LANGUAGE CXX)
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/x86_17.06.19_halide_runtime.bc PROPERTIES LANGUAGE CXX)
 
-list(APPEND LDFLAGS -lpthread -ldl)
+find_package(Threads)
+list(APPEND LDFLAGS ${CMAKE_THREAD_LIBS_INIT})
+foreach(lib ${CMAKE_DL_LIBS})
+  list(APPEND LDFLAGS -l${lib})
+endforeach()
 
 set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/x86_17.06.19_halide_runtime.bc ${uosources})
 set(PROG fft)
Index: test-suite/trunk/Bitcode/Regression/vector_widen/CMakeLists.txt
===================================================================
--- test-suite/trunk/Bitcode/Regression/vector_widen/CMakeLists.txt
+++ test-suite/trunk/Bitcode/Regression/vector_widen/CMakeLists.txt
@@ -1,7 +1,11 @@
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/halide_runtime.bc PROPERTIES LANGUAGE CXX)
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/vector_widen.bc PROPERTIES LANGUAGE CXX)
 
-list(APPEND LDFLAGS -lpthread -ldl)
+find_package(Threads)
+list(APPEND LDFLAGS ${CMAKE_THREAD_LIBS_INIT})
+foreach(lib ${CMAKE_DL_LIBS})
+  list(APPEND LDFLAGS -l${lib})
+endforeach()
 
 set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/halide_runtime.bc ${CMAKE_CURRENT_SOURCE_DIR}/vector_widen.bc)
 set(PROG widen_bug)
Index: test-suite/trunk/Bitcode/simd_ops/CMakeLists.txt
===================================================================
--- test-suite/trunk/Bitcode/simd_ops/CMakeLists.txt
+++ test-suite/trunk/Bitcode/simd_ops/CMakeLists.txt
@@ -5,7 +5,11 @@
 SET_SOURCE_FILES_PROPERTIES(${scalar_sources} PROPERTIES LANGUAGE CXX)
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_halide_runtime.bc PROPERTIES LANGUAGE CXX)
 
-list(APPEND LDFLAGS -lpthread -ldl)
+find_package(Threads)
+list(APPEND LDFLAGS ${CMAKE_THREAD_LIBS_INIT})
+foreach(lib ${CMAKE_DL_LIBS})
+  list(APPEND LDFLAGS -l${lib})
+endforeach()
 add_library(simd_ops STATIC simd_ops.cpp ${ARCH}_halide_runtime.bc)
 target_link_libraries(simd_ops)
 test_suite_add_build_dependencies(simd_ops)
Index: test-suite/trunk/Bitcode/Benchmarks/Halide/CMakeLists.txt
===================================================================
--- test-suite/trunk/Bitcode/Benchmarks/Halide/CMakeLists.txt
+++ test-suite/trunk/Bitcode/Benchmarks/Halide/CMakeLists.txt
@@ -1,5 +1,9 @@
 if(NOT WIN32)
-  list(APPEND LDFLAGS -lpthread -ldl)
+  find_package(Threads)
+  list(APPEND LDFLAGS ${CMAKE_THREAD_LIBS_INIT})
+  foreach(lib ${CMAKE_DL_LIBS})
+    list(APPEND LDFLAGS -l${lib})
+  endforeach()
 endif()
 if(NOT MSVC)
   list(APPEND CXXFLAGS "-std=c++11")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D43168.133798.patch
Type: text/x-patch
Size: 2926 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180211/33b65221/attachment.bin>