diff options
Diffstat (limited to 'lib/Target/CBackend')
| -rw-r--r-- | lib/Target/CBackend/CBackend.cpp | 5 | ||||
| -rw-r--r-- | lib/Target/CBackend/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | lib/Target/CBackend/CTargetMachine.h | 8 | ||||
| -rw-r--r-- | lib/Target/CBackend/LLVMBuild.txt | 31 | ||||
| -rw-r--r-- | lib/Target/CBackend/Makefile | 2 | ||||
| -rw-r--r-- | lib/Target/CBackend/TargetInfo/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | lib/Target/CBackend/TargetInfo/LLVMBuild.txt | 23 |
7 files changed, 62 insertions, 27 deletions
diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp index 69d8c46..8bce52c 100644 --- a/lib/Target/CBackend/CBackend.cpp +++ b/lib/Target/CBackend/CBackend.cpp @@ -1660,7 +1660,7 @@ bool CWriter::doInitialization(Module &M) { #if 0 std::string Triple = TheModule->getTargetTriple(); if (Triple.empty()) - Triple = llvm::sys::getHostTriple(); + Triple = llvm::sys::getDefaultTargetTriple(); std::string E; if (const Target *Match = TargetRegistry::lookupTarget(Triple, E)) @@ -3167,7 +3167,7 @@ std::string CWriter::InterpretASMConstraint(InlineAsm::ConstraintInfo& c) { const MCAsmInfo *TargetAsm; std::string Triple = TheModule->getTargetTriple(); if (Triple.empty()) - Triple = llvm::sys::getHostTriple(); + Triple = llvm::sys::getDefaultTargetTriple(); std::string E; if (const Target *Match = TargetRegistry::lookupTarget(Triple, E)) @@ -3604,7 +3604,6 @@ void CWriter::visitExtractValueInst(ExtractValueInst &EVI) { bool CTargetMachine::addPassesToEmitFile(PassManagerBase &PM, formatted_raw_ostream &o, CodeGenFileType FileType, - CodeGenOpt::Level OptLevel, bool DisableVerify) { if (FileType != TargetMachine::CGFT_AssemblyFile) return true; diff --git a/lib/Target/CBackend/CMakeLists.txt b/lib/Target/CBackend/CMakeLists.txt index 96ae49f..fa819a4 100644 --- a/lib/Target/CBackend/CMakeLists.txt +++ b/lib/Target/CBackend/CMakeLists.txt @@ -1,17 +1,5 @@ -add_llvm_target(CBackend +add_llvm_target(CBackendCodeGen CBackend.cpp ) -add_llvm_library_dependencies(LLVMCBackend - LLVMAnalysis - LLVMCBackendInfo - LLVMCodeGen - LLVMCore - LLVMMC - LLVMScalarOpts - LLVMSupport - LLVMTarget - LLVMTransformUtils - ) - add_subdirectory(TargetInfo) diff --git a/lib/Target/CBackend/CTargetMachine.h b/lib/Target/CBackend/CTargetMachine.h index 4f1ca97..8b2286e 100644 --- a/lib/Target/CBackend/CTargetMachine.h +++ b/lib/Target/CBackend/CTargetMachine.h @@ -21,14 +21,14 @@ namespace llvm { struct CTargetMachine : public TargetMachine { CTargetMachine(const Target &T, StringRef TT, - StringRef CPU, StringRef FS, - Reloc::Model RM, CodeModel::Model CM) - : TargetMachine(T, TT, CPU, FS) {} + StringRef CPU, StringRef FS, const TargetOptions &Options, + Reloc::Model RM, CodeModel::Model CM, + CodeGenOpt::Level OL) + : TargetMachine(T, TT, CPU, FS, Options) { } virtual bool addPassesToEmitFile(PassManagerBase &PM, formatted_raw_ostream &Out, CodeGenFileType FileType, - CodeGenOpt::Level OptLevel, bool DisableVerify); virtual const TargetData *getTargetData() const { return 0; } diff --git a/lib/Target/CBackend/LLVMBuild.txt b/lib/Target/CBackend/LLVMBuild.txt new file mode 100644 index 0000000..e64feb0 --- /dev/null +++ b/lib/Target/CBackend/LLVMBuild.txt @@ -0,0 +1,31 @@ +;===- ./lib/Target/CBackend/LLVMBuild.txt ----------------------*- Conf -*--===; +; +; The LLVM Compiler Infrastructure +; +; This file is distributed under the University of Illinois Open Source +; License. See LICENSE.TXT for details. +; +;===------------------------------------------------------------------------===; +; +; This is an LLVMBuild description file for the components in this subdirectory. +; +; For more information on the LLVMBuild system, please see: +; +; http://llvm.org/docs/LLVMBuild.html +; +;===------------------------------------------------------------------------===; + +[common] +subdirectories = TargetInfo + +[component_0] +type = TargetGroup +name = CBackend +parent = Target + +[component_1] +type = Library +name = CBackendCodeGen +parent = CBackend +required_libraries = Analysis CBackendInfo CodeGen Core MC Scalar Support Target TransformUtils +add_to_library_groups = CBackend diff --git a/lib/Target/CBackend/Makefile b/lib/Target/CBackend/Makefile index 621948a..bac3474 100644 --- a/lib/Target/CBackend/Makefile +++ b/lib/Target/CBackend/Makefile @@ -8,7 +8,7 @@ ##===----------------------------------------------------------------------===## LEVEL = ../../.. -LIBRARYNAME = LLVMCBackend +LIBRARYNAME = LLVMCBackendCodeGen DIRS = TargetInfo include $(LEVEL)/Makefile.common diff --git a/lib/Target/CBackend/TargetInfo/CMakeLists.txt b/lib/Target/CBackend/TargetInfo/CMakeLists.txt index 8e616be..6203616 100644 --- a/lib/Target/CBackend/TargetInfo/CMakeLists.txt +++ b/lib/Target/CBackend/TargetInfo/CMakeLists.txt @@ -3,9 +3,3 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/ add_llvm_library(LLVMCBackendInfo CBackendTargetInfo.cpp ) - -add_llvm_library_dependencies(LLVMCBackendInfo - LLVMMC - LLVMSupport - LLVMTarget - ) diff --git a/lib/Target/CBackend/TargetInfo/LLVMBuild.txt b/lib/Target/CBackend/TargetInfo/LLVMBuild.txt new file mode 100644 index 0000000..1b47d8e --- /dev/null +++ b/lib/Target/CBackend/TargetInfo/LLVMBuild.txt @@ -0,0 +1,23 @@ +;===- ./lib/Target/CBackend/TargetInfo/LLVMBuild.txt -----------*- Conf -*--===; +; +; The LLVM Compiler Infrastructure +; +; This file is distributed under the University of Illinois Open Source +; License. See LICENSE.TXT for details. +; +;===------------------------------------------------------------------------===; +; +; This is an LLVMBuild description file for the components in this subdirectory. +; +; For more information on the LLVMBuild system, please see: +; +; http://llvm.org/docs/LLVMBuild.html +; +;===------------------------------------------------------------------------===; + +[component_0] +type = Library +name = CBackendInfo +parent = CBackend +required_libraries = MC Support Target +add_to_library_groups = CBackend |