diff --git a/compiler/compilers.cc b/compiler/compilers.cc
index f58b38b..1237e70 100644
--- a/compiler/compilers.cc
+++ b/compiler/compilers.cc
@@ -107,6 +107,9 @@
     case kX86:
       mir_to_lir = X86CodeGenerator(cu, cu->mir_graph.get(), &cu->arena);
       break;
+    case kX86_64:
+      mir_to_lir = X86CodeGenerator(cu, cu->mir_graph.get(), &cu->arena);
+      break;
     default:
       LOG(FATAL) << "Unexpected instruction set: " << cu->instruction_set;
   }
@@ -125,6 +128,9 @@
   if (driver.GetInstructionSet() == kX86) {
     return X86CFIInitialization();
   }
+  if (driver.GetInstructionSet() == kX86_64) {
+    return X86CFIInitialization();
+  }
   return nullptr;
 }