delete the fixme too! :)

[oota-llvm.git] / lib / Target / X86 / X86TargetMachine.cpp

diff --git a/lib/Target/X86/X86TargetMachine.cpp b/lib/Target/X86/X86TargetMachine.cpp
index 689cebd57b0df1e5c619f6b90247d7f98ca77ce0..a61de1cd182aca87c564636914bbbb638241a492 100644 (file)
--- a/lib/Target/X86/X86TargetMachine.cpp
+++ b/lib/Target/X86/X86TargetMachine.cpp
@@ -27,11 +27,11 @@ static const MCAsmInfo *createMCAsmInfo(const Target &T,
   Triple TheTriple(TT);
   switch (TheTriple.getOS()) {
   case Triple::Darwin:
-    return new X86DarwinMCAsmInfo(TheTriple);
+    return new X86MCAsmInfoDarwin(TheTriple);
   case Triple::MinGW32:
   case Triple::MinGW64:
   case Triple::Cygwin:
-    return new X86COFFMCAsmInfo(TheTriple);
+    return new X86MCAsmInfoCOFF(TheTriple);
   case Triple::Win32:
     return new X86WinMCAsmInfo(TheTriple);
   default:
@@ -47,6 +47,10 @@ extern "C" void LLVMInitializeX86Target() {
   // Register the target asm info.
   RegisterAsmInfoFn A(TheX86_32Target, createMCAsmInfo);
   RegisterAsmInfoFn B(TheX86_64Target, createMCAsmInfo);
+
+  // Register the code emitter.
+  TargetRegistry::RegisterCodeEmitter(TheX86_32Target, createX86MCCodeEmitter);
+  TargetRegistry::RegisterCodeEmitter(TheX86_64Target, createX86MCCodeEmitter);
 }