From de8fda8908abb597869f69b78fc172df5a135a67 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Wed, 29 Dec 2010 03:59:27 +0000 Subject: [PATCH] CMake: Add disabling optimization on MSVC8 and MSVC10 as workaround for some files in Target/ARM and Target/X86. llvm-svn: 122623 --- llvm/lib/Target/ARM/CMakeLists.txt | 8 ++++++++ llvm/lib/Target/ARM/Disassembler/CMakeLists.txt | 4 ++-- llvm/lib/Target/X86/Disassembler/CMakeLists.txt | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/llvm/lib/Target/ARM/CMakeLists.txt b/llvm/lib/Target/ARM/CMakeLists.txt index 4f721f8a3f00..9c66a6a160a4 100644 --- a/llvm/lib/Target/ARM/CMakeLists.txt +++ b/llvm/lib/Target/ARM/CMakeLists.txt @@ -53,3 +53,11 @@ add_llvm_target(ARMCodeGen Thumb2RegisterInfo.cpp Thumb2SizeReduction.cpp ) + +# workaround for hanging compilation on MSVC10 +if( MSVC_VERSION EQUAL 1600 ) +set_property( + SOURCE ARMISelLowering.cpp + PROPERTY COMPILE_FLAGS "/Od" + ) +endif() diff --git a/llvm/lib/Target/ARM/Disassembler/CMakeLists.txt b/llvm/lib/Target/ARM/Disassembler/CMakeLists.txt index 5f4398977f2b..b23dd6ba57ef 100644 --- a/llvm/lib/Target/ARM/Disassembler/CMakeLists.txt +++ b/llvm/lib/Target/ARM/Disassembler/CMakeLists.txt @@ -4,8 +4,8 @@ add_llvm_library(LLVMARMDisassembler ARMDisassembler.cpp ARMDisassemblerCore.cpp ) -# workaround for hanging compilation on MSVC9 and 10 -if( MSVC_VERSION EQUAL 1500 OR MSVC_VERSION EQUAL 1600 ) +# workaround for hanging compilation on MSVC8, 9 and 10 +if( MSVC_VERSION EQUAL 1400 OR MSVC_VERSION EQUAL 1500 OR MSVC_VERSION EQUAL 1600 ) set_property( SOURCE ARMDisassembler.cpp PROPERTY COMPILE_FLAGS "/Od" diff --git a/llvm/lib/Target/X86/Disassembler/CMakeLists.txt b/llvm/lib/Target/X86/Disassembler/CMakeLists.txt index 97589c00515b..972a0d9e7e03 100644 --- a/llvm/lib/Target/X86/Disassembler/CMakeLists.txt +++ b/llvm/lib/Target/X86/Disassembler/CMakeLists.txt @@ -5,7 +5,7 @@ add_llvm_library(LLVMX86Disassembler X86DisassemblerDecoder.c ) # workaround for hanging compilation on MSVC9 and 10 -if( MSVC_VERSION EQUAL 1500 OR MSVC_VERSION EQUAL 1600 ) +if( MSVC_VERSION EQUAL 1400 OR MSVC_VERSION EQUAL 1500 OR MSVC_VERSION EQUAL 1600 ) set_property( SOURCE X86Disassembler.cpp PROPERTY COMPILE_FLAGS "/Od"