Normalize Subtarget constructors to take a target triple string instead of

Module*.

Also, dropped uses of TargetMachine where unnecessary. The only target which
still takes a TargetMachine& is Mips, I would appreciate it if someone would
normalize this to match other targets.

llvm-svn: 77918

3 files changed, 3 insertions, 8 deletions

diff --git a/llvm/lib/Target/Blackfin/BlackfinSubtarget.cpp b/llvm/lib/Target/Blackfin/BlackfinSubtarget.cpp
index 80a242182d8..e104c5245a9 100644
--- a/llvm/lib/Target/Blackfin/BlackfinSubtarget.cpp
+++ b/llvm/lib/Target/Blackfin/BlackfinSubtarget.cpp
@@ -16,8 +16,7 @@
 
 using namespace llvm;
 
-BlackfinSubtarget::BlackfinSubtarget(const TargetMachine &TM,
-                                     const Module &M,
+BlackfinSubtarget::BlackfinSubtarget(const std::string &TT,
                                      const std::string &FS)
   : sdram(false),
     icplb(false),
diff --git a/llvm/lib/Target/Blackfin/BlackfinSubtarget.h b/llvm/lib/Target/Blackfin/BlackfinSubtarget.h
index 13d8e240ab6..d667fe26519 100644
--- a/llvm/lib/Target/Blackfin/BlackfinSubtarget.h
+++ b/llvm/lib/Target/Blackfin/BlackfinSubtarget.h
@@ -19,9 +19,6 @@
 
 namespace llvm {
 
-  class TargetMachine;
-  class Module;
-
   class BlackfinSubtarget : public TargetSubtarget {
     bool sdram;
     bool icplb;
@@ -35,8 +32,7 @@ namespace llvm {
     bool wa_killed_mmr;
     bool wa_rets;
   public:
-    BlackfinSubtarget(const TargetMachine &TM, const Module &M,
-                      const std::string &FS);
+    BlackfinSubtarget(const std::string &TT, const std::string &FS);
 
     /// ParseSubtargetFeatures - Parses features string setting specified
     /// subtarget options.  Definition of function is auto generated by tblgen.
diff --git a/llvm/lib/Target/Blackfin/BlackfinTargetMachine.cpp b/llvm/lib/Target/Blackfin/BlackfinTargetMachine.cpp
index 059916b2007..b69adf609ee 100644
--- a/llvm/lib/Target/Blackfin/BlackfinTargetMachine.cpp
+++ b/llvm/lib/Target/Blackfin/BlackfinTargetMachine.cpp
@@ -32,7 +32,7 @@ BlackfinTargetMachine::BlackfinTargetMachine(const Target &T,
                                              const std::string &FS)
   : LLVMTargetMachine(T),
     DataLayout("e-p:32:32-i64:32-f64:32"),
-    Subtarget(*this, M, FS),
+    Subtarget(M.getTargetTriple(), FS),
     TLInfo(*this),
     InstrInfo(Subtarget),
     FrameInfo(TargetFrameInfo::StackGrowsDown, 4, 0) {