[llvm] r202806 - Cleaning up a bunch of pre-Visual C++ 2012 build hacks.

[Yaron Keren]

Author: yrnkrn
Date: Tue Mar  4 03:23:33 2014
New Revision: 202806

URL: http://llvm.org/viewvc/llvm-project?rev=202806&view=rev
Log:
Cleaning up a bunch of pre-Visual C++ 2012 build hacks.


Modified:
    llvm/trunk/CMakeLists.txt
    llvm/trunk/lib/IR/CMakeLists.txt
    llvm/trunk/lib/Target/ARM/CMakeLists.txt
    llvm/trunk/lib/Target/ARM/Disassembler/CMakeLists.txt
    llvm/trunk/lib/Target/Mips/Disassembler/CMakeLists.txt
    llvm/trunk/unittests/ADT/CMakeLists.txt
    llvm/trunk/unittests/IR/CMakeLists.txt

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=202806&r1=202805&r2=202806&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Tue Mar  4 03:23:33 2014
@@ -562,12 +562,3 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
     )
 endif()
 
-# Workaround for MSVS10 to avoid the Dialog Hell
-# FIXME: This could be removed with future version of CMake.
-if(MSVC_VERSION EQUAL 1600)
-  set(LLVM_SLN_FILENAME "${CMAKE_CURRENT_BINARY_DIR}/LLVM.sln")
-  if( EXISTS "${LLVM_SLN_FILENAME}" )
-    file(APPEND "${LLVM_SLN_FILENAME}" "\n# This should be regenerated!\n")
-  endif()
-endif()
-

Modified: llvm/trunk/lib/IR/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/CMakeLists.txt?rev=202806&r1=202805&r2=202806&view=diff
==============================================================================
--- llvm/trunk/lib/IR/CMakeLists.txt (original)
+++ llvm/trunk/lib/IR/CMakeLists.txt Tue Mar  4 03:23:33 2014
@@ -43,13 +43,4 @@ add_llvm_library(LLVMCore
   Verifier.cpp
   )
 
-# Workaround: It takes over 20 minutes to compile with msvc10.
-# FIXME: Suppressing optimizations to core libraries would not be good thing.
-if( MSVC_VERSION LESS 1700 )
-set_property(
-  SOURCE Function.cpp
-  PROPERTY COMPILE_FLAGS "/Og-"
-  )
-endif()
-
 add_dependencies(LLVMCore intrinsics_gen)

Modified: llvm/trunk/lib/Target/ARM/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/CMakeLists.txt?rev=202806&r1=202805&r2=202806&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/ARM/CMakeLists.txt Tue Mar  4 03:23:33 2014
@@ -49,14 +49,6 @@ add_llvm_target(ARMCodeGen
   Thumb2SizeReduction.cpp
   )
 
-# workaround for hanging compilation on MSVC9, 10
-if( MSVC_VERSION EQUAL 1600 OR MSVC_VERSION EQUAL 1500 )
-set_property(
-  SOURCE ARMISelLowering.cpp
-  PROPERTY COMPILE_FLAGS "/Od"
-  )
-endif()
-
 add_subdirectory(TargetInfo)
 add_subdirectory(AsmParser)
 add_subdirectory(Disassembler)

Modified: llvm/trunk/lib/Target/ARM/Disassembler/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/Disassembler/CMakeLists.txt?rev=202806&r1=202805&r2=202806&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/Disassembler/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/ARM/Disassembler/CMakeLists.txt Tue Mar  4 03:23:33 2014
@@ -1,10 +1,3 @@
 add_llvm_library(LLVMARMDisassembler
   ARMDisassembler.cpp
   )
-# 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"
-  )
-endif()

Modified: llvm/trunk/lib/Target/Mips/Disassembler/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/Disassembler/CMakeLists.txt?rev=202806&r1=202805&r2=202806&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/Disassembler/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/Mips/Disassembler/CMakeLists.txt Tue Mar  4 03:23:33 2014
@@ -1,11 +1,3 @@
 add_llvm_library(LLVMMipsDisassembler
   MipsDisassembler.cpp
   )
-
-# workaround for hanging compilation on MSVC9 and 10
-if( MSVC_VERSION EQUAL 1400 OR MSVC_VERSION EQUAL 1500 OR MSVC_VERSION EQUAL 1600 )
-set_property(
-  SOURCE MipsDisassembler.cpp
-  PROPERTY COMPILE_FLAGS "/Od"
-  )
-endif()

Modified: llvm/trunk/unittests/ADT/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ADT/CMakeLists.txt?rev=202806&r1=202805&r2=202806&view=diff
==============================================================================
--- llvm/trunk/unittests/ADT/CMakeLists.txt (original)
+++ llvm/trunk/unittests/ADT/CMakeLists.txt Tue Mar  4 03:23:33 2014
@@ -41,15 +41,6 @@ set(ADTSources
   polymorphic_ptr_test.cpp
  )
 
-# They cannot be compiled on MSVC9 due to its bug.
-if(MSVC AND MSVC_VERSION LESS 1600)
-  set(LLVM_OPTIONAL_SOURCES
-    DenseMapTest.cpp
-    SmallVectorTest.cpp
-    )
-  list(REMOVE_ITEM ADTSources ${LLVM_OPTIONAL_SOURCES})
-endif()
-
 add_llvm_unittest(ADTTests
   ${ADTSources}
   )

Modified: llvm/trunk/unittests/IR/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/IR/CMakeLists.txt?rev=202806&r1=202805&r2=202806&view=diff
==============================================================================
--- llvm/trunk/unittests/IR/CMakeLists.txt (original)
+++ llvm/trunk/unittests/IR/CMakeLists.txt Tue Mar  4 03:23:33 2014
@@ -25,12 +25,6 @@ set(IRSources
   WaymarkTest.cpp
   )
 
-# MSVC9 and 8 cannot compile ValueMapTest.cpp due to their bug.
-# See issue#331418 in Visual Studio.
-if(MSVC AND MSVC_VERSION LESS 1600)
-  list(REMOVE_ITEM IRSources ValueMapTest.cpp)
-endif()
-
 # HACK: Declare a couple of source files as optionally compiled to satisfy the
 # missing-file-checker in LLVM's weird CMake build.
 set(LLVM_OPTIONAL_SOURCES