Simplify JIT target selection.

[oota-llvm.git] / lib / Target / MSIL / MSILWriter.h

diff --git a/lib/Target/MSIL/MSILWriter.h b/lib/Target/MSIL/MSILWriter.h
index cbb2d31e7dba1aac1a76d2862ececbca26303e39..21ff359920a3ae22c9a57492c491e4e43ffcb519 100644 (file)
--- a/lib/Target/MSIL/MSILWriter.h
+++ b/lib/Target/MSIL/MSILWriter.h
@@ -19,18 +19,22 @@
 #include "llvm/IntrinsicInst.h"
 #include "llvm/Pass.h"
 #include "llvm/PassManager.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/Analysis/FindUsedTypes.h"
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Support/FormattedStream.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Target/TargetMachine.h"
-#include "llvm/Target/TargetMachineRegistry.h"
 #include "llvm/Support/Mangler.h"
 #include <ios>
 using namespace llvm;
 
-namespace {
+namespace llvm {
+  extern Target TheMSILTarget;
+}
+
+namespace MSIL {
 
   class MSILModule : public ModulePass {
     Module *ModulePtr;
@@ -85,15 +89,11 @@ namespace {
       StaticInitList;
     const std::set<const Type *>* UsedTypes;
     static char ID;
-<<<<<<< .mine
-    MSILWriter(formatted_raw_ostream &o) : FunctionPass(&ID), Out(o) {
-=======
     DenseMap<const Value*, unsigned> AnonValueNumbers;
     unsigned NextAnonValueNumber;
 
-    MSILWriter(raw_ostream &o)
-       : FunctionPass(&ID), Out(o), NextAnonValueNumber(0) {
->>>>>>> .r75668
+    MSILWriter(formatted_raw_ostream &o) : FunctionPass(&ID), Out(o),
+         NextAnonValueNumber(0) {
       UniqID = 0;
     }
 
@@ -252,11 +252,12 @@ namespace {
 
     const char* getLibraryName(const GlobalVariable* GV); 
     
-    const char* getLibraryForSymbol(const char* Name, bool isFunction,
+    const char* getLibraryForSymbol(const StringRef &Name, bool isFunction,
                                     unsigned CallingConv);
 
     void printExternals();
   };
+
 }
 
 #endif