2 files changed, 13 insertions, 1 deletions
diff --git a/llvm/lib/Target/PTX/PTXInstrInfo.cpp b/llvm/lib/Target/PTX/PTXInstrInfo.cpp
index 7f0fa8b23bc..caa72b45ff9 100644
--- a/llvm/lib/Target/PTX/PTXInstrInfo.cpp
+++ b/llvm/lib/Target/PTX/PTXInstrInfo.cpp
@@ -18,6 +18,7 @@
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/SelectionDAG.h"
 #include "llvm/CodeGen/SelectionDAGNodes.h"
+#include "llvm/Target/TargetRegistry.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
 
@@ -408,3 +409,14 @@ MachineBasicBlock *PTXInstrInfo::GetBranchTarget(const MachineInstr& inst) {
   assert(target.isMBB() && "FIXME: detect branch target operand");
   return target.getMBB();
 }
+
+MCInstrInfo *createPTXMCInstrInfo() {
+  MCInstrInfo *X = new MCInstrInfo();
+  InitPTXMCInstrInfo(X);
+  return X;
+}
+
+extern "C" void LLVMInitializePTXMCInstrInfo() {
+  TargetRegistry::RegisterMCInstrInfo(ThePTX32Target, createPTXMCInstrInfo);
+  TargetRegistry::RegisterMCInstrInfo(ThePTX64Target, createPTXMCInstrInfo);
+}
diff --git a/llvm/lib/Target/PTX/PTXSubtarget.cpp b/llvm/lib/Target/PTX/PTXSubtarget.cpp
index a8a2ef7309a..ff051672a3e 100644
--- a/llvm/lib/Target/PTX/PTXSubtarget.cpp
+++ b/llvm/lib/Target/PTX/PTXSubtarget.cpp
@@ -71,7 +71,7 @@ std::string PTXSubtarget::getPTXVersionString() const {
 MCSubtargetInfo *createPTXMCSubtargetInfo(StringRef TT, StringRef CPU,
                                             StringRef FS) {
   MCSubtargetInfo *X = new MCSubtargetInfo();
-  InitPTXMCSubtargetInfo(X, CPU, FS);
+  InitPTXMCSubtargetInfo(X, TT, CPU, FS);
   return X;
 }