Fix CMake build

Clean up the LLVMBuild and CMakeLists.txt files

BUG=none
TEST=none

Review URL: https://codereview.chromium.org/14328017

13 files changed, 23 insertions, 15 deletions

diff --git a/lib/Analysis/CMakeLists.txt b/lib/Analysis/CMakeLists.txt
index 4c64c4a4d8..65f3ddd911 100644
--- a/lib/Analysis/CMakeLists.txt
+++ b/lib/Analysis/CMakeLists.txt
@@ -64,3 +64,4 @@ add_llvm_library(LLVMAnalysis
 add_dependencies(LLVMAnalysis intrinsics_gen)
 
 add_subdirectory(IPA)
+add_subdirectory(NaCl) # LOCALMOD
\ No newline at end of file
diff --git a/lib/Analysis/NaCl/CMakeLists.txt b/lib/Analysis/NaCl/CMakeLists.txt
index a01a333802..05319dcd8f 100644
--- a/lib/Analysis/NaCl/CMakeLists.txt
+++ b/lib/Analysis/NaCl/CMakeLists.txt
@@ -1,7 +1,7 @@
-add_llvm_library(LLVMNaClAnalysis
-  PNaCLABITypeChecker.cpp
+add_llvm_library(LLVMnaclanalysis
+  PNaClABITypeChecker.cpp
   PNaClABIVerifyFunctions.cpp
   PNaClABIVerifyModule.cpp
   )
 
-add_dependencies(LLVMNaClAnalysis intrinsics_gen)
+add_dependencies(LLVMnaclanalysis intrinsics_gen)
diff --git a/lib/Analysis/NaCl/LLVMBuild.txt b/lib/Analysis/NaCl/LLVMBuild.txt
index b5e7c8a5ea..72c9a26ce6 100644
--- a/lib/Analysis/NaCl/LLVMBuild.txt
+++ b/lib/Analysis/NaCl/LLVMBuild.txt
@@ -19,5 +19,5 @@
 type = Library
 name = NaClAnalysis
 parent = Analysis
-library_name = NaClAnalysis
+library_name = naclanalysis
 required_libraries = Analysis Core Support
diff --git a/lib/Target/Mips/CMakeLists.txt b/lib/Target/Mips/CMakeLists.txt
index 58aa1be34d..5f68791890 100644
--- a/lib/Target/Mips/CMakeLists.txt
+++ b/lib/Target/Mips/CMakeLists.txt
@@ -30,6 +30,10 @@ add_llvm_target(MipsCodeGen
   MipsLongBranch.cpp
   MipsMCInstLower.cpp
   MipsMachineFunction.cpp
+# LOCALMOD-BEGIN
+  MipsNaClHeaders.cpp
+  MipsNaClRewritePass.cpp
+# LOCALMOD-END
   MipsRegisterInfo.cpp
   MipsSEFrameLowering.cpp
   MipsSEInstrInfo.cpp
diff --git a/lib/Target/Mips/MCTargetDesc/CMakeLists.txt b/lib/Target/Mips/MCTargetDesc/CMakeLists.txt
index 4212c94a55..06b32f7df4 100644
--- a/lib/Target/Mips/MCTargetDesc/CMakeLists.txt
+++ b/lib/Target/Mips/MCTargetDesc/CMakeLists.txt
@@ -7,6 +7,9 @@ add_llvm_library(LLVMMipsDesc
   MipsELFObjectWriter.cpp
   MipsReginfo.cpp
   MipsELFStreamer.cpp
+# LOCALMOD-BEGIN
+  MipsMCNaCl.cpp
+# LOCALMOD-END
   )
 
 add_dependencies(LLVMMipsDesc MipsCommonTableGen)
diff --git a/lib/Transforms/NaCl/CMakeLists.txt b/lib/Transforms/NaCl/CMakeLists.txt
index 5d630bb111..f41fc128c9 100644
--- a/lib/Transforms/NaCl/CMakeLists.txt
+++ b/lib/Transforms/NaCl/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(LLVMTransformsNaCl
+add_llvm_library(LLVMnacltransforms
   ExpandConstantExpr.cpp
   ExpandCtors.cpp
   ExpandGetElementPtr.cpp
@@ -10,4 +10,4 @@ add_llvm_library(LLVMTransformsNaCl
   StripMetadata.cpp
   )
 
-add_dependencies(LLVMTransformsNaCl intrinsics_gen)
+add_dependencies(LLVMnacltransforms intrinsics_gen)
diff --git a/lib/Transforms/NaCl/LLVMBuild.txt b/lib/Transforms/NaCl/LLVMBuild.txt
index 14c85c9c04..217df31e4e 100644
--- a/lib/Transforms/NaCl/LLVMBuild.txt
+++ b/lib/Transforms/NaCl/LLVMBuild.txt
@@ -19,5 +19,5 @@
 type = Library
 name = NaClTransforms
 parent = Transforms
-library_name = NaClTransforms
-required_libraries = Core
+library_name = nacltransforms
+required_libraries = Core Support
diff --git a/lib/Transforms/Scalar/CMakeLists.txt b/lib/Transforms/Scalar/CMakeLists.txt
index 7a855ab99a..fd55e082ac 100644
--- a/lib/Transforms/Scalar/CMakeLists.txt
+++ b/lib/Transforms/Scalar/CMakeLists.txt
@@ -31,7 +31,6 @@ add_llvm_library(LLVMScalarOpts
   SimplifyLibCalls.cpp
   Sink.cpp
   TailRecursionElimination.cpp
-  NaClCcRewrite.cpp
   )
 
 add_dependencies(LLVMScalarOpts intrinsics_gen)
diff --git a/tools/llc/CMakeLists.txt b/tools/llc/CMakeLists.txt
index 1a8c50780e..908d4756cc 100644
--- a/tools/llc/CMakeLists.txt
+++ b/tools/llc/CMakeLists.txt
@@ -1,9 +1,10 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} bitreader asmparser NaClAnalysis)
+set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} bitreader asmparser naclanalysis)
 
 add_llvm_tool(llc
 # LOCALMOD BEGIN
 # This file provides wrappers to lseek(2), read(2), etc. 
   nacl_file.cpp
+  SRPCStreamer.cpp
   StubMaker.cpp
   TextStubWriter.cpp
 # LOCALMOD END
diff --git a/tools/opt/CMakeLists.txt b/tools/opt/CMakeLists.txt
index cf5e5a83cf..3b268a4205 100644
--- a/tools/opt/CMakeLists.txt
+++ b/tools/opt/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} bitreader asmparser bitwriter instrumentation scalaropts objcarcopts ipo vectorize)
+set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} bitreader asmparser bitwriter instrumentation naclanalysis nacltransforms scalaropts objcarcopts ipo vectorize)
 
 add_llvm_tool(opt
   AnalysisWrappers.cpp
diff --git a/tools/opt/LLVMBuild.txt b/tools/opt/LLVMBuild.txt
index a866d12a26..02567c2234 100644
--- a/tools/opt/LLVMBuild.txt
+++ b/tools/opt/LLVMBuild.txt
@@ -19,4 +19,4 @@
 type = Tool
 name = opt
 parent = Tools
-required_libraries = AsmParser BitReader BitWriter IPO Instrumentation Scalar ObjCARC all-targets
+required_libraries = AsmParser BitReader BitWriter IPO Instrumentation Scalar ObjCARC all-targets NaClTransforms NaClAnalysis
diff --git a/tools/pnacl-abicheck/CMakeLists.txt b/tools/pnacl-abicheck/CMakeLists.txt
index d3296fa5a5..f75731bcf4 100644
--- a/tools/pnacl-abicheck/CMakeLists.txt
+++ b/tools/pnacl-abicheck/CMakeLists.txt
@@ -1,5 +1,5 @@
-set(LLVM_LINK_COMPONENTS bitreader asmparser)
+set(LLVM_LINK_COMPONENTS bitreader asmparser naclanalysis)
 
 add_llvm_tool(pnacl-abicheck
-  pnacl-abicheck.cc
+  pnacl-abicheck.cpp
   )
diff --git a/tools/pnacl-abicheck/LLVMBuild.txt b/tools/pnacl-abicheck/LLVMBuild.txt
index 0af322769c..92311c59b6 100644
--- a/tools/pnacl-abicheck/LLVMBuild.txt
+++ b/tools/pnacl-abicheck/LLVMBuild.txt
@@ -19,4 +19,4 @@
 type = Tool
 name = pnacl-abicheck
 parent = Tools
-required_libraries = AsmParser BitReader
+required_libraries = AsmParser BitReader NaClAnalysis