eliminate FileModel::Model, just use CodeGenFileType. The client

of the code generator shouldn't care what object format a target
uses.

llvm-svn: 95124

1 files changed, 7 insertions, 10 deletions

diff --git a/llvm/lib/CodeGen/LLVMTargetMachine.cpp b/llvm/lib/CodeGen/LLVMTargetMachine.cpp
index 4bb8af5ac6f..81b73aeec49 100644
--- a/llvm/lib/CodeGen/LLVMTargetMachine.cpp
+++ b/llvm/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