summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael J. Spencer <bigcheesegs@gmail.com>2011-10-17 17:50:39 +0000
committerMichael J. Spencer <bigcheesegs@gmail.com>2011-10-17 17:50:39 +0000
commit9904056a7061f6e42d38dd565c23990f0a56e9e1 (patch)
tree1c6fffae962c5bb954568e0a92aecab996862243
parent6c15fec3c5b4770570a4d681762a7bd510e65077 (diff)
downloadllvm-9904056a7061f6e42d38dd565c23990f0a56e9e1.tar.gz
llvm-9904056a7061f6e42d38dd565c23990f0a56e9e1.tar.bz2
llvm-9904056a7061f6e42d38dd565c23990f0a56e9e1.tar.xz
Fix CMake build.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@142204 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Target/ARM/CMakeLists.txt1
-rw-r--r--lib/Transforms/Scalar/CMakeLists.txt1
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/Target/ARM/CMakeLists.txt b/lib/Target/ARM/CMakeLists.txt
index f045e839a6..d6a5c57847 100644
--- a/lib/Target/ARM/CMakeLists.txt
+++ b/lib/Target/ARM/CMakeLists.txt
@@ -26,7 +26,6 @@ add_llvm_target(ARMCodeGen
ARMExpandPseudoInsts.cpp
ARMFastISel.cpp
ARMFrameLowering.cpp
- ARMGlobalMerge.cpp
ARMHazardRecognizer.cpp
ARMISelDAGToDAG.cpp
ARMISelLowering.cpp
diff --git a/lib/Transforms/Scalar/CMakeLists.txt b/lib/Transforms/Scalar/CMakeLists.txt
index 79bcae5825..a6f0cf3239 100644
--- a/lib/Transforms/Scalar/CMakeLists.txt
+++ b/lib/Transforms/Scalar/CMakeLists.txt
@@ -7,6 +7,7 @@ add_llvm_library(LLVMScalarOpts
DCE.cpp
DeadStoreElimination.cpp
EarlyCSE.cpp
+ GlobalMerge.cpp
GVN.cpp
IndVarSimplify.cpp
JumpThreading.cpp