Refactor things a bit to allow the ELF code emitter to run the X86 machine code emitter

after itself.

llvm-svn: 22376

1 files changed, 8 insertions, 1 deletions

diff --git a/llvm/lib/Target/X86/X86TargetMachine.cpp b/llvm/lib/Target/X86/X86TargetMachine.cpp
index def4f9cfa49..a0537f529c1 100644
--- a/llvm/lib/Target/X86/X86TargetMachine.cpp
+++ b/llvm/lib/Target/X86/X86TargetMachine.cpp
@@ -162,7 +162,7 @@ bool X86TargetMachine::addPassesToEmitFile(PassManager &PM, std::ostream &Out,
       // FIXME: We only support emission of ELF files for now, this should check
       // the target triple and decide on the format to write (e.g. COFF on
       // win32).
-      PM.add(createX86ELFObjectWriterPass(Out, *this));
+      addX86ELFObjectWriterPass(PM, Out, *this);
       break;
     }
 
@@ -225,3 +225,10 @@ void X86JITInfo::addPassesToJITCompile(FunctionPassManager &PM) {
     PM.add(createX86CodePrinterPass(std::cerr, TM));
 }
 
+bool X86TargetMachine::addPassesToEmitMachineCode(FunctionPassManager &PM,
+                                                  MachineCodeEmitter &MCE) {
+  PM.add(createX86CodeEmitterPass(MCE));
+  // Delete machine code for this function
+  PM.add(createMachineCodeDeleter());
+  return false;
+}