[llvm-commits] [llvm] r75871 - in /llvm/trunk: CMakeLists.txt cmake/modules/LLVMConfig.cmake

[Daniel Dunbar]

Author: ddunbar
Date: Wed Jul 15 19:35:05 2009
New Revision: 75871

URL: http://llvm.org/viewvc/llvm-project?rev=75871&view=rev
Log:
Kill off cmake magic to force linking.
 - This isn't needed anymore, we require clients to call the appropriate
   initialization routines using TargetSelect.h.

Modified:
    llvm/trunk/CMakeLists.txt
    llvm/trunk/cmake/modules/LLVMConfig.cmake

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=75871&r1=75870&r2=75871&view=diff

==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Wed Jul 15 19:35:05 2009
@@ -63,10 +63,6 @@
   XCore
   )
 
-# List of targets whose asmprinters need to be forced to link
-# into executables on some platforms (i.e. Windows):
-set(LLVM_ASMPRINTERS_FORCE_LINK X86 PowerPC)
-
 if( MSVC )
   set(LLVM_TARGETS_TO_BUILD X86
     CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")

Modified: llvm/trunk/cmake/modules/LLVMConfig.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVMConfig.cmake?rev=75871&r1=75870&r2=75871&view=diff

==============================================================================
--- llvm/trunk/cmake/modules/LLVMConfig.cmake (original)
+++ llvm/trunk/cmake/modules/LLVMConfig.cmake Wed Jul 15 19:35:05 2009
@@ -27,36 +27,8 @@
 function(explicit_llvm_config executable)
   set( link_components ${ARGN} )
 
-  set(lfgs)
-  if (MSVC)
-    if( CMAKE_CL_64 )
-      set(include_lflag "/INCLUDE:")
-    else( CMAKE_CL_64 )
-      set(include_lflag "/INCLUDE:_")
-    endif()
-    foreach(c ${link_components})
-      if( c STREQUAL "jit" )
-        set(lfgs "${lfgs} ${include_lflag}X86TargetMachineModule")
-      endif( c STREQUAL "jit" )
-      list(FIND LLVM_TARGETS_TO_BUILD ${c} idx)
-      if( NOT idx LESS 0 )
-        set(lfgs "${lfgs} ${include_lflag}${c}TargetMachineModule")
-        list(FIND LLVM_ASMPRINTERS_FORCE_LINK ${c} idx)
-        if( NOT idx LESS 0 )
-	  set(lfgs "${lfgs} ${include_lflag}${c}AsmPrinterForceLink")
-        endif()
-      endif()
-    endforeach(c)
-  endif ()
-
   explicit_map_components_to_libraries(LIBRARIES ${link_components})
   target_link_libraries(${executable} ${LIBRARIES})
-
-  if( lfgs )
-    set_target_properties(${executable}
-      PROPERTIES
-      LINK_FLAGS ${lfgs})
-  endif()
 endfunction(explicit_llvm_config)