[test-suite] r255756 - Set -lm more fine-grained, making general cmake rules a bit cleaner.

Kristof Beyls via llvm-commits llvm-commits at lists.llvm.org
Wed Dec 16 01:03:41 PST 2015


Author: kbeyls
Date: Wed Dec 16 03:03:41 2015
New Revision: 255756

URL: http://llvm.org/viewvc/llvm-project?rev=255756&view=rev
Log:
Set -lm more fine-grained, making general cmake rules a bit cleaner.

This reverts r255239 which did set -lm on all MultiSource links, and
instead sets it more fine-grained. An unnecessarily broad appending of
-lm in SingleSource/CMakeLists.txt is also removed.

Thank Matthias Braun for prodding me on this!

Differential Revision: http://reviews.llvm.org/D15523


Modified:
    test-suite/trunk/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/nbench/CMakeLists.txt
    test-suite/trunk/SingleSource/CMakeLists.txt
    test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt
    test-suite/trunk/cmake/modules/SingleMultiSource.cmake

Modified: test-suite/trunk/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt?rev=255756&r1=255755&r2=255756&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt Wed Dec 16 03:03:41 2015
@@ -5,6 +5,7 @@ set(PARALLEL_DIRS)
 
 set(LEVEL ../../../..)
 set(PROG dbms)
+list(APPEND LDFLAGS -lm)
 if(DEFINED SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS -i ${CMAKE_CURRENT_SOURCE_DIR}/dbms.train.in)
 else()

Modified: test-suite/trunk/MultiSource/Benchmarks/nbench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/nbench/CMakeLists.txt?rev=255756&r1=255755&r2=255756&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/nbench/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/nbench/CMakeLists.txt Wed Dec 16 03:03:41 2015
@@ -6,7 +6,7 @@ set(PARALLEL_DIRS)
 set(LEVEL ../../..)
 set(PROG nbench)
 set(CPPFLAGS -DBASE_ITERATIONS=25)
-set(LDFLAGS )
+set(LDFLAGS -lm)
 if("${ARCH}" STREQUAL "XCore")
   set(RUNTIMELIMIT 7200)
 else()

Modified: test-suite/trunk/SingleSource/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/CMakeLists.txt?rev=255756&r1=255755&r2=255756&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/CMakeLists.txt Wed Dec 16 03:03:41 2015
@@ -8,7 +8,6 @@ set(PARALLEL_DIRS Regression Benchmarks)
 if(NOT DEFINED BENCHMARKING_ONLY)
   list(APPEND PARALLEL_DIRS UnitTests)
 endif()
-list(APPEND LDFLAGS -lm)
 llvm_singlesource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})

Modified: test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt?rev=255756&r1=255755&r2=255756&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt Wed Dec 16 03:03:41 2015
@@ -12,6 +12,7 @@ endif()
 if(DEFINED BENCHMARKING_ONLY)
   list(APPEND PROGRAMS_TO_SKIP 2003-05-14-initialize-string 2003-05-21-BitfieldHandling 2003-05-21-UnionBitfields 2003-05-21-UnionTest 2003-05-22-LocalTypeTest 2003-05-22-VarSizeArray 2003-05-23-TransparentUnion 2003-06-16-InvalidInitializer 2003-06-16-VolatileError 2003-10-12-GlobalVarInitializers 2004-02-03-AggregateCopy 2004-03-15-IndirectGoto 2005-05-06-LongLongSignedShift 2008-01-07-LongDouble badidx bigstack callargs casts compare ConstructorDestructorAttributes DuffsDevice globalrefs matrixTranspose pointer_arithmetic PR10189 PR1386 PR491 PR640 sumarray sumarray2d sumarraymalloc test_indvars testtrace)
 endif()
+list(APPEND LDFLAGS -lm)
 llvm_singlesource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})

Modified: test-suite/trunk/cmake/modules/SingleMultiSource.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/modules/SingleMultiSource.cmake?rev=255756&r1=255755&r2=255756&view=diff
==============================================================================
--- test-suite/trunk/cmake/modules/SingleMultiSource.cmake (original)
+++ test-suite/trunk/cmake/modules/SingleMultiSource.cmake Wed Dec 16 03:03:41 2015
@@ -180,7 +180,6 @@ macro(llvm_multisource)
     append_cflags(${source_exename} CPPFLAGS)
     append_cflags(${source_exename} CXXFLAGS)
     append_ldflags(${source_exename} LDFLAGS)
-    target_link_libraries(${source_exename} -lm)
     llvm_add_test(${PROG} ${source_exename})
     add_dependencies(${source_exename} timeit timeit-target fpcmp)
   endif()




More information about the llvm-commits mailing list