[llvm-commits] [llvm] r135234 - in /llvm/trunk: cmake/modules/LLVMLibDeps.cmake lib/Target/ARM/CMakeLists.txt lib/Target/ARM/MCTargetDesc/CMakeLists.txt lib/Target/Alpha/CMakeLists.txt lib/Target/Blackfin/CMakeLists.txt lib/Target/SystemZ/CMakeLi
Francois Pichet
pichet2000 at gmail.com
Thu Jul 14 19:08:26 PDT 2011
Link errors on MSVC: http://pastie.org/2215596
On Thu, Jul 14, 2011 at 8:40 PM, Chandler Carruth <chandlerc at gmail.com> wrote:
> Author: chandlerc
> Date: Thu Jul 14 19:40:52 2011
> New Revision: 135234
>
> URL: http://llvm.org/viewvc/llvm-project?rev=135234&view=rev
> Log:
> Major update to CMake build to reflect changes in r135219 in the
> backend. Moved some MCAsmInfo files down into the MCTargetDesc
> sublibraries, removed some (i suspect long) dead files from other parts
> of the CMake build, etc. Also copied the include directory hack from the
> Makefile.
>
> Finally, updated the lib deps. I spot checked this, and think its
> correct, but review appreciated there.
>
> Modified:
> llvm/trunk/cmake/modules/LLVMLibDeps.cmake
> llvm/trunk/lib/Target/ARM/CMakeLists.txt
> llvm/trunk/lib/Target/ARM/MCTargetDesc/CMakeLists.txt
> llvm/trunk/lib/Target/Alpha/CMakeLists.txt
> llvm/trunk/lib/Target/Blackfin/CMakeLists.txt
> llvm/trunk/lib/Target/SystemZ/CMakeLists.txt
> llvm/trunk/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt
> llvm/trunk/lib/Target/X86/CMakeLists.txt
> llvm/trunk/lib/Target/X86/MCTargetDesc/CMakeLists.txt
> llvm/trunk/lib/Target/XCore/CMakeLists.txt
> llvm/trunk/lib/Target/XCore/MCTargetDesc/CMakeLists.txt
>
> Modified: llvm/trunk/cmake/modules/LLVMLibDeps.cmake
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVMLibDeps.cmake?rev=135234&r1=135233&r2=135234&view=diff
> ==============================================================================
> --- llvm/trunk/cmake/modules/LLVMLibDeps.cmake (original)
> +++ llvm/trunk/cmake/modules/LLVMLibDeps.cmake Thu Jul 14 19:40:52 2011
> @@ -1,7 +1,7 @@
> set(MSVC_LIB_DEPS_LLVMARMAsmParser LLVMARMCodeGen LLVMARMInfo LLVMMC LLVMMCParser LLVMSupport LLVMTarget)
> set(MSVC_LIB_DEPS_LLVMARMAsmPrinter LLVMMC LLVMSupport)
> set(MSVC_LIB_DEPS_LLVMARMCodeGen LLVMARMAsmPrinter LLVMARMDesc LLVMARMInfo LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget)
> -set(MSVC_LIB_DEPS_LLVMARMDesc LLVMARMInfo LLVMMC)
> +set(MSVC_LIB_DEPS_LLVMARMDesc LLVMARMInfo LLVMMC LLVMSupport)
> set(MSVC_LIB_DEPS_LLVMARMDisassembler LLVMARMCodeGen LLVMARMDesc LLVMARMInfo LLVMMC LLVMSupport)
> set(MSVC_LIB_DEPS_LLVMARMInfo LLVMMC LLVMSupport)
> set(MSVC_LIB_DEPS_LLVMAlphaCodeGen LLVMAlphaDesc LLVMAlphaInfo LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget)
> @@ -34,11 +34,11 @@
> set(MSVC_LIB_DEPS_LLVMMBlazeAsmParser LLVMMBlazeCodeGen LLVMMBlazeInfo LLVMMC LLVMMCParser LLVMSupport LLVMTarget)
> set(MSVC_LIB_DEPS_LLVMMBlazeAsmPrinter LLVMMC LLVMSupport)
> set(MSVC_LIB_DEPS_LLVMMBlazeCodeGen LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMBlazeAsmPrinter LLVMMBlazeDesc LLVMMBlazeInfo LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget)
> -set(MSVC_LIB_DEPS_LLVMMBlazeDesc LLVMMBlazeInfo LLVMMC)
> +set(MSVC_LIB_DEPS_LLVMMBlazeDesc LLVMMBlazeInfo LLVMMC LLVMSupport)
> set(MSVC_LIB_DEPS_LLVMMBlazeDisassembler LLVMMBlazeCodeGen LLVMMBlazeDesc LLVMMBlazeInfo LLVMMC)
> set(MSVC_LIB_DEPS_LLVMMBlazeInfo LLVMMC LLVMSupport)
> set(MSVC_LIB_DEPS_LLVMMC LLVMSupport)
> -set(MSVC_LIB_DEPS_LLVMMCDisassembler LLVMARMAsmParser LLVMARMCodeGen LLVMARMDisassembler LLVMARMInfo LLVMAlphaCodeGen LLVMAlphaInfo LLVMBlackfinCodeGen LLVMBlackfinInfo LLVMCBackend LLVMCBackendInfo LLVMCellSPUCodeGen LLVMCellSPUInfo LLVMCppBackend LLVMCppBackendInfo LLVMMBlazeAsmParser LLVMMBlazeCodeGen LLVMMBlazeDisassembler LLVMMBlazeInfo LLVMMC LLVMMCParser LLVMMSP430CodeGen LLVMMSP430Info LLVMMipsCodeGen LLVMMipsInfo LLVMPTXCodeGen LLVMPTXInfo LLVMPowerPCCodeGen LLVMPowerPCInfo LLVMSparcCodeGen LLVMSparcInfo LLVMSupport LLVMSystemZCodeGen LLVMSystemZInfo LLVMTarget LLVMX86AsmParser LLVMX86CodeGen LLVMX86Disassembler LLVMX86Info LLVMXCoreCodeGen LLVMXCoreInfo)
> +set(MSVC_LIB_DEPS_LLVMMCDisassembler LLVMARMAsmParser LLVMARMCodeGen LLVMARMDesc LLVMARMDisassembler LLVMARMInfo LLVMAlphaCodeGen LLVMAlphaDesc LLVMAlphaInfo LLVMBlackfinCodeGen LLVMBlackfinDesc LLVMBlackfinInfo LLVMCBackend LLVMCBackendInfo LLVMCellSPUCodeGen LLVMCellSPUDesc LLVMCellSPUInfo LLVMCppBackend LLVMCppBackendInfo LLVMMBlazeAsmParser LLVMMBlazeCodeGen LLVMMBlazeDesc LLVMMBlazeDisassembler LLVMMBlazeInfo LLVMMC LLVMMCParser LLVMMSP430CodeGen LLVMMSP430Desc LLVMMSP430Info LLVMMipsCodeGen LLVMMipsDesc LLVMMipsInfo LLVMPTXCodeGen LLVMPTXDesc LLVMPTXInfo LLVMPowerPCCodeGen LLVMPowerPCDesc LLVMPowerPCInfo LLVMSparcCodeGen LLVMSparcDesc LLVMSparcInfo LLVMSupport LLVMSystemZCodeGen LLVMSystemZDesc LLVMSystemZInfo LLVMTarget LLVMX86AsmParser LLVMX86CodeGen LLVMX86Desc LLVMX86Disassembler LLVMX86Info LLVMXCoreCodeGen LLVMXCoreDesc LLVMXCoreInfo)
> set(MSVC_LIB_DEPS_LLVMMCJIT LLVMCore LLVMExecutionEngine LLVMRuntimeDyld LLVMSupport LLVMTarget)
> set(MSVC_LIB_DEPS_LLVMMCParser LLVMMC LLVMSupport)
> set(MSVC_LIB_DEPS_LLVMMSP430AsmPrinter LLVMMC LLVMSupport)
> @@ -55,7 +55,7 @@
> set(MSVC_LIB_DEPS_LLVMPTXInfo LLVMMC LLVMSupport)
> set(MSVC_LIB_DEPS_LLVMPowerPCAsmPrinter LLVMMC LLVMSupport)
> set(MSVC_LIB_DEPS_LLVMPowerPCCodeGen LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMPowerPCAsmPrinter LLVMPowerPCDesc LLVMPowerPCInfo LLVMSelectionDAG LLVMSupport LLVMTarget)
> -set(MSVC_LIB_DEPS_LLVMPowerPCDesc LLVMMC LLVMPowerPCInfo)
> +set(MSVC_LIB_DEPS_LLVMPowerPCDesc LLVMMC LLVMPowerPCInfo LLVMSupport)
> set(MSVC_LIB_DEPS_LLVMPowerPCInfo LLVMMC LLVMSupport)
> set(MSVC_LIB_DEPS_LLVMRuntimeDyld LLVMObject LLVMSupport)
> set(MSVC_LIB_DEPS_LLVMScalarOpts LLVMAnalysis LLVMCore LLVMInstCombine LLVMSupport LLVMTarget LLVMTransformUtils)
>
> Modified: llvm/trunk/lib/Target/ARM/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/CMakeLists.txt?rev=135234&r1=135233&r2=135234&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/ARM/CMakeLists.txt (original)
> +++ llvm/trunk/lib/Target/ARM/CMakeLists.txt Thu Jul 14 19:40:52 2011
> @@ -36,7 +36,6 @@
> ARMMCCodeEmitter.cpp
> ARMMCExpr.cpp
> ARMLoadStoreOptimizer.cpp
> - ARMMCAsmInfo.cpp
> ARMMCInstLower.cpp
> ARMRegisterInfo.cpp
> ARMSelectionDAGInfo.cpp
>
> Modified: llvm/trunk/lib/Target/ARM/MCTargetDesc/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/CMakeLists.txt?rev=135234&r1=135233&r2=135234&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/ARM/MCTargetDesc/CMakeLists.txt (original)
> +++ llvm/trunk/lib/Target/ARM/MCTargetDesc/CMakeLists.txt Thu Jul 14 19:40:52 2011
> @@ -1,2 +1,7 @@
> -add_llvm_library(LLVMARMDesc ARMMCTargetDesc.cpp)
> +add_llvm_library(LLVMARMDesc
> + ARMMCTargetDesc.cpp
> + ARMMCAsmInfo.cpp
> + )
>
> +# Hack: we need to include 'main' target directory to grab private headers
> +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/..)
>
> Modified: llvm/trunk/lib/Target/Alpha/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/CMakeLists.txt?rev=135234&r1=135233&r2=135234&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/Alpha/CMakeLists.txt (original)
> +++ llvm/trunk/lib/Target/Alpha/CMakeLists.txt Thu Jul 14 19:40:52 2011
> @@ -15,7 +15,6 @@
> AlphaISelLowering.cpp
> AlphaFrameLowering.cpp
> AlphaLLRP.cpp
> - AlphaMCAsmInfo.cpp
> AlphaRegisterInfo.cpp
> AlphaSubtarget.cpp
> AlphaTargetMachine.cpp
>
> Modified: llvm/trunk/lib/Target/Blackfin/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Blackfin/CMakeLists.txt?rev=135234&r1=135233&r2=135234&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/Blackfin/CMakeLists.txt (original)
> +++ llvm/trunk/lib/Target/Blackfin/CMakeLists.txt Thu Jul 14 19:40:52 2011
> @@ -15,7 +15,6 @@
> BlackfinISelDAGToDAG.cpp
> BlackfinISelLowering.cpp
> BlackfinFrameLowering.cpp
> - BlackfinMCAsmInfo.cpp
> BlackfinRegisterInfo.cpp
> BlackfinSubtarget.cpp
> BlackfinTargetMachine.cpp
>
> Modified: llvm/trunk/lib/Target/SystemZ/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/CMakeLists.txt?rev=135234&r1=135233&r2=135234&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/SystemZ/CMakeLists.txt (original)
> +++ llvm/trunk/lib/Target/SystemZ/CMakeLists.txt Thu Jul 14 19:40:52 2011
> @@ -13,7 +13,6 @@
> SystemZISelLowering.cpp
> SystemZInstrInfo.cpp
> SystemZFrameLowering.cpp
> - SystemZMCAsmInfo.cpp
> SystemZRegisterInfo.cpp
> SystemZSubtarget.cpp
> SystemZTargetMachine.cpp
>
> Modified: llvm/trunk/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt?rev=135234&r1=135233&r2=135234&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt (original)
> +++ llvm/trunk/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt Thu Jul 14 19:40:52 2011
> @@ -1 +1,7 @@
> -add_llvm_library(LLVMSystemZDesc SystemZMCTargetDesc.cpp)
> +add_llvm_library(LLVMSystemZDesc
> + SystemZMCTargetDesc.cpp
> + SystemZMCAsmInfo.cpp
> + )
> +
> +# Hack: we need to include 'main' target directory to grab private headers
> +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/..)
>
> Modified: llvm/trunk/lib/Target/X86/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/CMakeLists.txt?rev=135234&r1=135233&r2=135234&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/X86/CMakeLists.txt (original)
> +++ llvm/trunk/lib/Target/X86/CMakeLists.txt Thu Jul 14 19:40:52 2011
> @@ -27,7 +27,6 @@
> X86InstrInfo.cpp
> X86JITInfo.cpp
> X86MachObjectWriter.cpp
> - X86MCAsmInfo.cpp
> X86MCCodeEmitter.cpp
> X86MCInstLower.cpp
> X86RegisterInfo.cpp
>
> Modified: llvm/trunk/lib/Target/X86/MCTargetDesc/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/CMakeLists.txt?rev=135234&r1=135233&r2=135234&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/X86/MCTargetDesc/CMakeLists.txt (original)
> +++ llvm/trunk/lib/Target/X86/MCTargetDesc/CMakeLists.txt Thu Jul 14 19:40:52 2011
> @@ -1,2 +1,7 @@
> -add_llvm_library(LLVMX86Desc X86MCTargetDesc.cpp)
> +add_llvm_library(LLVMX86Desc
> + X86MCTargetDesc.cpp
> + X86MCAsmInfo.cpp
> + )
>
> +# Hack: we need to include 'main' target directory to grab private headers
> +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/..)
>
> Modified: llvm/trunk/lib/Target/XCore/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/CMakeLists.txt?rev=135234&r1=135233&r2=135234&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/XCore/CMakeLists.txt (original)
> +++ llvm/trunk/lib/Target/XCore/CMakeLists.txt Thu Jul 14 19:40:52 2011
> @@ -13,7 +13,6 @@
> XCoreInstrInfo.cpp
> XCoreISelDAGToDAG.cpp
> XCoreISelLowering.cpp
> - XCoreMCAsmInfo.cpp
> XCoreRegisterInfo.cpp
> XCoreSubtarget.cpp
> XCoreTargetMachine.cpp
>
> Modified: llvm/trunk/lib/Target/XCore/MCTargetDesc/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/MCTargetDesc/CMakeLists.txt?rev=135234&r1=135233&r2=135234&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/XCore/MCTargetDesc/CMakeLists.txt (original)
> +++ llvm/trunk/lib/Target/XCore/MCTargetDesc/CMakeLists.txt Thu Jul 14 19:40:52 2011
> @@ -1 +1,7 @@
> -add_llvm_library(LLVMXCoreDesc XCoreMCTargetDesc.cpp)
> +add_llvm_library(LLVMXCoreDesc
> + XCoreMCTargetDesc.cpp
> + XCoreMCAsmInfo.cpp
> + )
> +
> +# Hack: we need to include 'main' target directory to grab private headers
> +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/..)
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
More information about the llvm-commits
mailing list