2 files changed, 4 insertions, 15 deletions

diff --git a/include/llvm/Target/TargetMachine.h b/include/llvm/Target/TargetMachine.h
index 387d296847..188db3a1ca 100644
--- a/include/llvm/Target/TargetMachine.h
+++ b/include/llvm/Target/TargetMachine.h
@@ -33,7 +33,6 @@ class MRegisterInfo;
 class FunctionPassManager;
 class PassManager;
 class Pass;
-class IntrinsicLowering;
 
 // Relocation model types.
 namespace Reloc {
@@ -54,28 +53,24 @@ namespace Reloc {
 class TargetMachine {
   const std::string Name;
   const TargetData DataLayout;       // Calculates type size & alignment
-  IntrinsicLowering *IL;             // Specifies how to lower intrinsic calls
 
   TargetMachine(const TargetMachine&);   // DO NOT IMPLEMENT
   void operator=(const TargetMachine&);  // DO NOT IMPLEMENT
 protected: // Can only create subclasses...
-  TargetMachine(const std::string &name, IntrinsicLowering *IL,
-                bool LittleEndian = false,
+  TargetMachine(const std::string &name, bool LittleEndian = false,
                 unsigned char PtrSize = 8, unsigned char PtrAl = 8,
                 unsigned char DoubleAl = 8, unsigned char FloatAl = 4,
                 unsigned char LongAl = 8, unsigned char IntAl = 4,
                 unsigned char ShortAl = 2, unsigned char ByteAl = 1,
                 unsigned char BoolAl = 1);
 
-  TargetMachine(const std::string &name, IntrinsicLowering *IL,
-                const TargetData &TD);
+  TargetMachine(const std::string &name, const TargetData &TD);
 
   /// This constructor is used for targets that support arbitrary TargetData
   /// layouts, like the C backend.  It initializes the TargetData to match that
   /// of the specified module.
   ///
-  TargetMachine(const std::string &name, IntrinsicLowering *IL,
-                const Module &M);
+  TargetMachine(const std::string &name, const Module &M);
 
   /// getSubtargetImpl - virtual method implemented by subclasses that returns
   /// a reference to that target's TargetSubtarget-derived member variable.
@@ -99,12 +94,6 @@ public:
 
   const std::string &getName() const { return Name; }
 
-  /// getIntrinsicLowering - This method returns a reference to an
-  /// IntrinsicLowering instance which should be used by the code generator to
-  /// lower unknown intrinsic functions to the equivalent LLVM expansion.
-  ///
-  IntrinsicLowering &getIntrinsicLowering() const { return *IL; }
-
   // Interfaces to the major aspects of target machine information:
   // -- Instruction opcode and operand information
   // -- Pipelines and scheduling information
diff --git a/include/llvm/Target/TargetMachineRegistry.h b/include/llvm/Target/TargetMachineRegistry.h
index f1dcc6a2db..55cc958177 100644
--- a/include/llvm/Target/TargetMachineRegistry.h
+++ b/include/llvm/Target/TargetMachineRegistry.h
@@ -80,7 +80,7 @@ namespace llvm {
     }
   private:
     static TargetMachine *Allocator(const Module &M, const std::string &FS) {
-      return new TargetMachineImpl(M, 0, FS);
+      return new TargetMachineImpl(M, FS);
     }
   };