Rewrite mwait and monitor support and custom lower arguments.

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

diff --git a/lib/Target/X86/TargetInfo/X86TargetInfo.cpp b/lib/Target/X86/TargetInfo/X86TargetInfo.cpp
index d371bced71f61757eee01085dafa8e3759c282bd..08d4d84f8a8adbd3c6dcbc22f0f727bff60adab7 100644 (file)
--- a/lib/Target/X86/TargetInfo/X86TargetInfo.cpp
+++ b/lib/Target/X86/TargetInfo/X86TargetInfo.cpp
@@ -12,36 +12,12 @@
 #include "llvm/Target/TargetRegistry.h"
 using namespace llvm;
 
-Target llvm::TheX86_32Target;
-
-static unsigned X86_32_TripleMatchQuality(const std::string &TT) {
-  // We strongly match "i[3-9]86-*".
-  if (TT.size() >= 5 && TT[0] == 'i' && TT[2] == '8' && TT[3] == '6' &&
-      TT[4] == '-' && TT[1] - '3' < 6)
-    return 20;
-
-  return 0;
-}
-
-Target llvm::TheX86_64Target;
-
-static unsigned X86_64_TripleMatchQuality(const std::string &TT) {
-  // We strongly match "x86_64-*".
-  if (TT.size() >= 7 && TT[0] == 'x' && TT[1] == '8' && TT[2] == '6' &&
-      TT[3] == '_' && TT[4] == '6' && TT[5] == '4' && TT[6] == '-')
-    return 20;
-  
-  return 0;
-}
+Target llvm::TheX86_32Target, llvm::TheX86_64Target;
 
 extern "C" void LLVMInitializeX86TargetInfo() { 
-  TargetRegistry::RegisterTarget(TheX86_32Target, "x86",    
-                                  "32-bit X86: Pentium-Pro and above",
-                                  &X86_32_TripleMatchQuality,
-                                  /*HasJIT=*/true);
+  RegisterTarget<Triple::x86, /*HasJIT=*/true>
+    X(TheX86_32Target, "x86", "32-bit X86: Pentium-Pro and above");
 
-  TargetRegistry::RegisterTarget(TheX86_64Target, "x86-64",    
-                                  "64-bit X86: EM64T and AMD64",
-                                  &X86_64_TripleMatchQuality,
-                                  /*HasJIT=*/true);
+  RegisterTarget<Triple::x86_64, /*HasJIT=*/true>
+    Y(TheX86_64Target, "x86-64", "64-bit X86: EM64T and AMD64");
 }