- Add MCRegisterInfo registration machinery. Also added x86 registration routines.
- Rename TargetRegisterDesc to MCRegisterDesc.
llvm-svn: 133820
diff --git a/llvm/lib/Target/X86/TargetDesc/X86TargetDesc.cpp b/llvm/lib/Target/X86/TargetDesc/X86TargetDesc.cpp
index cf03d48..8d61745 100644
--- a/llvm/lib/Target/X86/TargetDesc/X86TargetDesc.cpp
+++ b/llvm/lib/Target/X86/TargetDesc/X86TargetDesc.cpp
@@ -13,6 +13,7 @@
#include "X86TargetDesc.h"
#include "llvm/MC/MCRegisterInfo.h"
+#include "llvm/Target/TargetRegistry.h"
#include "X86GenRegisterDesc.inc"
using namespace llvm;
@@ -21,3 +22,12 @@
InitX86MCRegisterInfo(X);
return X;
}
+
+// Force static initialization.
+extern "C" void LLVMInitializeX86MCRegInfo() {
+ RegisterMCRegInfo<MCRegisterInfo> X(TheX86_32Target);
+ RegisterMCRegInfo<MCRegisterInfo> Y(TheX86_64Target);
+
+ TargetRegistry::RegisterMCRegInfo(TheX86_32Target, createX86MCRegisterInfo);
+ TargetRegistry::RegisterMCRegInfo(TheX86_64Target, createX86MCRegisterInfo);
+}
diff --git a/llvm/lib/Target/X86/TargetDesc/X86TargetDesc.h b/llvm/lib/Target/X86/TargetDesc/X86TargetDesc.h
index d08aec7..d31f301 100644
--- a/llvm/lib/Target/X86/TargetDesc/X86TargetDesc.h
+++ b/llvm/lib/Target/X86/TargetDesc/X86TargetDesc.h
@@ -11,6 +11,12 @@
//
//===----------------------------------------------------------------------===//
+namespace llvm {
+class Target;
+
+extern Target TheX86_32Target, TheX86_64Target;
+} // End llvm namespace
+
// Defines symbolic names for X86 registers. This defines a mapping from
// register name to register number.
//