[llvm-commits] [dragonegg] r95218 - /dragonegg/trunk/llvm-backend.cpp

[Duncan Sands]

Author: baldrick
Date: Wed Feb  3 04:27:26 2010
New Revision: 95218

URL: http://llvm.org/viewvc/llvm-project?rev=95218&view=rev
Log:
Port commit 95129 (lattner) from llvm-gcc:
update for recent api changes.

Modified:
    dragonegg/trunk/llvm-backend.cpp

Modified: dragonegg/trunk/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/llvm-backend.cpp?rev=95218&r1=95217&r2=95218&view=diff

==============================================================================
--- dragonegg/trunk/llvm-backend.cpp (original)
+++ dragonegg/trunk/llvm-backend.cpp Wed Feb  3 04:27:26 2010
@@ -672,21 +672,14 @@
     // Note, this also adds codegenerator level optimization passes.
     InitializeOutputStreams(false);
     switch (TheTarget->addPassesToEmitFile(*PM, FormattedOutStream,
-                                           TargetMachine::AssemblyFile,
+                                           TargetMachine::CGFT_AssemblyFile,
                                            OptLevel)) {
     default:
-    case FileModel::Error:
       errs() << "Error interfacing to target machine!\n";
       exit(1);
-    case FileModel::AsmFile:
+    case TargetMachine::CGFT_AssemblyFile:
       break;
     }
-
-    if (TheTarget->addPassesToEmitFileFinish(*PM, (MachineCodeEmitter *)0,
-                                             OptLevel)) {
-      errs() << "Error interfacing to target machine!\n";
-      exit(1);
-    }
   }
   
   if (HasPerFunctionPasses) {
@@ -771,21 +764,14 @@
       // Note, this also adds codegenerator level optimization passes.
       InitializeOutputStreams(false);
       switch (TheTarget->addPassesToEmitFile(*PM, FormattedOutStream,
-                                             TargetMachine::AssemblyFile,
+                                             TargetMachine::CGFT_AssemblyFile,
                                              OptLevel)) {
       default:
-      case FileModel::Error:
         errs() << "Error interfacing to target machine!\n";
         exit(1);
-      case FileModel::AsmFile:
+      case TargetMachine::CGFT_AssemblyFile:
         break;
       }
-
-      if (TheTarget->addPassesToEmitFileFinish(*PM, (MachineCodeEmitter *)0,
-                                               OptLevel)) {
-        errs() << "Error interfacing to target machine!\n";
-        exit(1);
-      }
     }
   }