diff options
| author | Derek Schuff <dschuff@chromium.org> | 2013-04-22 15:16:54 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2013-04-22 15:16:54 -0700 |
| commit | 744ccd6c8bd149a17575b9d768b9a90ce06bf122 (patch) | |
| tree | 7aa638a69e7dd07d5439d9e8928944fef65aff0e | |
| parent | 2f436965e5830fd3bc77d915c3598d47fe37a2a2 (diff) | |
Fix bot build of translator, renormalize CMakeLists/LLVMBuild.txt/Makefile
naming to better match upstream
R=jvoung@chromium.org
BUG=bot LLVM roll
Review URL: https://codereview.chromium.org/14315012
| -rw-r--r-- | lib/Analysis/NaCl/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | lib/Analysis/NaCl/LLVMBuild.txt | 2 | ||||
| -rw-r--r-- | lib/Transforms/NaCl/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | lib/Transforms/NaCl/LLVMBuild.txt | 2 | ||||
| -rw-r--r-- | lib/Transforms/NaCl/Makefile | 2 | ||||
| -rw-r--r-- | tools/llc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/llc/Makefile | 2 | ||||
| -rw-r--r-- | tools/opt/Makefile | 2 | ||||
| -rw-r--r-- | tools/pnacl-abicheck/Makefile | 2 |
9 files changed, 10 insertions, 12 deletions
diff --git a/lib/Analysis/NaCl/CMakeLists.txt b/lib/Analysis/NaCl/CMakeLists.txt index 05319dcd8f..f62a4e5c02 100644 --- a/lib/Analysis/NaCl/CMakeLists.txt +++ b/lib/Analysis/NaCl/CMakeLists.txt @@ -1,7 +1,7 @@ -add_llvm_library(LLVMnaclanalysis +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 72c9a26ce6..b5e7c8a5ea 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/Transforms/NaCl/CMakeLists.txt b/lib/Transforms/NaCl/CMakeLists.txt index f41fc128c9..d11e574aad 100644 --- a/lib/Transforms/NaCl/CMakeLists.txt +++ b/lib/Transforms/NaCl/CMakeLists.txt @@ -1,4 +1,4 @@ -add_llvm_library(LLVMnacltransforms +add_llvm_library(LLVMNaClTransforms ExpandConstantExpr.cpp ExpandCtors.cpp ExpandGetElementPtr.cpp @@ -10,4 +10,4 @@ add_llvm_library(LLVMnacltransforms StripMetadata.cpp ) -add_dependencies(LLVMnacltransforms intrinsics_gen) +add_dependencies(LLVMNaClTransforms intrinsics_gen) diff --git a/lib/Transforms/NaCl/LLVMBuild.txt b/lib/Transforms/NaCl/LLVMBuild.txt index 217df31e4e..153e7ebd6d 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 +library_name = NaClTransforms required_libraries = Core Support diff --git a/lib/Transforms/NaCl/Makefile b/lib/Transforms/NaCl/Makefile index ecf8db6eae..f297b753d7 100644 --- a/lib/Transforms/NaCl/Makefile +++ b/lib/Transforms/NaCl/Makefile @@ -8,7 +8,7 @@ ##===----------------------------------------------------------------------===## LEVEL = ../../.. -LIBRARYNAME = LLVMTransformsNaCl +LIBRARYNAME = LLVMNaClTransforms BUILD_ARCHIVE = 1 include $(LEVEL)/Makefile.common diff --git a/tools/llc/CMakeLists.txt b/tools/llc/CMakeLists.txt index 908d4756cc..1f531d07d0 100644 --- a/tools/llc/CMakeLists.txt +++ b/tools/llc/CMakeLists.txt @@ -1,12 +1,10 @@ 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 llc.cpp ) diff --git a/tools/llc/Makefile b/tools/llc/Makefile index 647c24172b..63150146f4 100644 --- a/tools/llc/Makefile +++ b/tools/llc/Makefile @@ -9,7 +9,7 @@ LEVEL := ../.. TOOLNAME := llc -LINK_COMPONENTS := all-targets bitreader asmparser NaClAnalysis +LINK_COMPONENTS := all-targets bitreader asmparser naclanalysis include $(LEVEL)/Makefile.common diff --git a/tools/opt/Makefile b/tools/opt/Makefile index 79ed815dce..ff07e3fe4f 100644 --- a/tools/opt/Makefile +++ b/tools/opt/Makefile @@ -9,6 +9,6 @@ LEVEL := ../.. TOOLNAME := opt -LINK_COMPONENTS := bitreader bitwriter asmparser instrumentation scalaropts objcarcopts ipo vectorize all-targets +LINK_COMPONENTS := bitreader bitwriter asmparser instrumentation scalaropts objcarcopts ipo vectorize nacltransforms naclanalysis all-targets include $(LEVEL)/Makefile.common diff --git a/tools/pnacl-abicheck/Makefile b/tools/pnacl-abicheck/Makefile index bd98690dd1..5f10e81ce9 100644 --- a/tools/pnacl-abicheck/Makefile +++ b/tools/pnacl-abicheck/Makefile @@ -9,7 +9,7 @@ LEVEL := ../.. TOOLNAME := pnacl-abicheck -LINK_COMPONENTS := bitreader asmparser +LINK_COMPONENTS := bitreader asmparser naclanalysis include $(LEVEL)/Makefile.common |