X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FTarget%2FX86%2FCMakeLists.txt;h=fba2c280d200141eba3cb468ea97803025d39df0;hb=ab0b15dff8539826283a59c2dd700a18a9680e0f;hp=77606ba36ee465869d9853aa9a4c1bc755c4cebc;hpb=ef70d2a39399a33e4cb42f7bc98a2aa793dd7e65;p=oota-llvm.git diff --git a/lib/Target/X86/CMakeLists.txt b/lib/Target/X86/CMakeLists.txt index 77606ba36ee..fba2c280d20 100644 --- a/lib/Target/X86/CMakeLists.txt +++ b/lib/Target/X86/CMakeLists.txt @@ -14,15 +14,14 @@ add_public_tablegen_target(X86CommonTableGen) set(sources X86AsmPrinter.cpp - X86COFFMachineModuleInfo.cpp - X86CodeEmitter.cpp + X86CallFrameOptimization.cpp + X86ExpandPseudo.cpp X86FastISel.cpp X86FloatingPoint.cpp X86FrameLowering.cpp X86ISelDAGToDAG.cpp X86ISelLowering.cpp X86InstrInfo.cpp - X86JITInfo.cpp X86MCInstLower.cpp X86MachineFunctionInfo.cpp X86PadShortFunction.cpp @@ -34,19 +33,15 @@ set(sources X86TargetTransformInfo.cpp X86VZeroUpper.cpp X86FixupLEAs.cpp + X86WinEHState.cpp ) if( CMAKE_CL_64 ) - # A workaround for a bug in cmake 2.8.3. See PR 8885. - if( CMAKE_VERSION STREQUAL "2.8.3" ) - include(CMakeDetermineCompilerId) - endif() - # end of workaround. enable_language(ASM_MASM) ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/X86CompilationCallback_Win64.obj MAIN_DEPENDENCY X86CompilationCallback_Win64.asm - COMMAND ${CMAKE_ASM_MASM_COMPILER} /Fo ${CMAKE_CURRENT_BINARY_DIR}/X86CompilationCallback_Win64.obj /c ${CMAKE_CURRENT_SOURCE_DIR}/X86CompilationCallback_Win64.asm + COMMAND ${CMAKE_ASM_MASM_COMPILER} /nologo /Fo ${CMAKE_CURRENT_BINARY_DIR}/X86CompilationCallback_Win64.obj /c ${CMAKE_CURRENT_SOURCE_DIR}/X86CompilationCallback_Win64.asm ) set(sources ${sources} ${CMAKE_CURRENT_BINARY_DIR}/X86CompilationCallback_Win64.obj) endif()