From 53f24980e669cfa1585636897172a9c2013b850e Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 2 Feb 2010 21:06:45 +0000 Subject: eliminate FileModel::Model, just use CodeGenFileType. The client of the code generator shouldn't care what object format a target uses. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@95124 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/LLVMTargetMachine.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'lib/CodeGen/LLVMTargetMachine.cpp') diff --git a/lib/CodeGen/LLVMTargetMachine.cpp b/lib/CodeGen/LLVMTargetMachine.cpp index 4bb8af5..81b73ae 100644 --- a/lib/CodeGen/LLVMTargetMachine.cpp +++ b/lib/CodeGen/LLVMTargetMachine.cpp @@ -96,28 +96,25 @@ LLVMTargetMachine::setCodeModelForStatic() { setCodeModel(CodeModel::Small); } -FileModel::Model +TargetMachine::CodeGenFileType LLVMTargetMachine::addPassesToEmitFile(PassManagerBase &PM, formatted_raw_ostream &Out, CodeGenFileType FileType, CodeGenOpt::Level OptLevel) { // Add common CodeGen passes. if (addCommonCodeGenPasses(PM, OptLevel)) - return FileModel::Error; + return CGFT_ErrorOccurred; - FileModel::Model ResultTy; switch (FileType) { default: - return FileModel::Error; - case TargetMachine::ObjectFile: - return FileModel::Error; - case TargetMachine::AssemblyFile: { + case CGFT_ObjectFile: + return CGFT_ErrorOccurred; + case CGFT_AssemblyFile: { FunctionPass *Printer = getTarget().createAsmPrinter(Out, *this, getMCAsmInfo(), getAsmVerbosityDefault()); - if (Printer == 0) return FileModel::Error; + if (Printer == 0) return CGFT_ErrorOccurred; PM.add(Printer); - ResultTy = FileModel::AsmFile; break; } } @@ -125,7 +122,7 @@ LLVMTargetMachine::addPassesToEmitFile(PassManagerBase &PM, // Make sure the code model is set. setCodeModelForStatic(); PM.add(createGCInfoDeleter()); - return ResultTy; + return FileType; } /// addPassesToEmitMachineCode - Add passes to the specified pass manager to -- cgit v1.1