summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaron Keren <yaron.keren@gmail.com>2014-03-04 09:23:33 +0000
committerYaron Keren <yaron.keren@gmail.com>2014-03-04 09:23:33 +0000
commitb62b44ccc5a6b147a41766bb39bc662fb0c589bd (patch)
treefc53df34fc8f3d5d1fc15f4a36bdc2657ae0dba9
parent13f0d301e80d5bb43924d049ac7a3f853df20394 (diff)
downloadllvm-b62b44ccc5a6b147a41766bb39bc662fb0c589bd.tar.gz
llvm-b62b44ccc5a6b147a41766bb39bc662fb0c589bd.tar.bz2
llvm-b62b44ccc5a6b147a41766bb39bc662fb0c589bd.tar.xz
Cleaning up a bunch of pre-Visual C++ 2012 build hacks.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@202806 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--CMakeLists.txt9
-rw-r--r--lib/IR/CMakeLists.txt9
-rw-r--r--lib/Target/ARM/CMakeLists.txt8
-rw-r--r--lib/Target/ARM/Disassembler/CMakeLists.txt7
-rw-r--r--lib/Target/Mips/Disassembler/CMakeLists.txt8
-rw-r--r--unittests/ADT/CMakeLists.txt9
-rw-r--r--unittests/IR/CMakeLists.txt6
7 files changed, 0 insertions, 56 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f513c558a..f3a09dd9f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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()
-
diff --git a/lib/IR/CMakeLists.txt b/lib/IR/CMakeLists.txt
index 1ee7140ae4..b1a0a06a08 100644
--- a/lib/IR/CMakeLists.txt
+++ b/lib/IR/CMakeLists.txt
@@ -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)
diff --git a/lib/Target/ARM/CMakeLists.txt b/lib/Target/ARM/CMakeLists.txt
index 66d015e2b3..eff99c27e4 100644
--- a/lib/Target/ARM/CMakeLists.txt
+++ b/lib/Target/ARM/CMakeLists.txt
@@ -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)
diff --git a/lib/Target/ARM/Disassembler/CMakeLists.txt b/lib/Target/ARM/Disassembler/CMakeLists.txt
index 92bc709ecb..2d9d534d6e 100644
--- a/lib/Target/ARM/Disassembler/CMakeLists.txt
+++ b/lib/Target/ARM/Disassembler/CMakeLists.txt
@@ -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()
diff --git a/lib/Target/Mips/Disassembler/CMakeLists.txt b/lib/Target/Mips/Disassembler/CMakeLists.txt
index 35b0999d0e..a64d02c474 100644
--- a/lib/Target/Mips/Disassembler/CMakeLists.txt
+++ b/lib/Target/Mips/Disassembler/CMakeLists.txt
@@ -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()
diff --git a/unittests/ADT/CMakeLists.txt b/unittests/ADT/CMakeLists.txt
index f26ac02feb..88e8186f33 100644
--- a/unittests/ADT/CMakeLists.txt
+++ b/unittests/ADT/CMakeLists.txt
@@ -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}
)
diff --git a/unittests/IR/CMakeLists.txt b/unittests/IR/CMakeLists.txt
index a597a3524a..305079f2dd 100644
--- a/unittests/IR/CMakeLists.txt
+++ b/unittests/IR/CMakeLists.txt
@@ -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